Make python ProtocolHandler available even with Cython

aholmberg · aholmberg · commit bdb55d021814 · 2016-02-26T15:07:00.000-06:00
PYTHON-501
diff --git a/cassandra/protocol.py b/cassandra/protocol.py
@@ -894,15 +894,15 @@ def recv_schema_change(cls, f, protocol_version):
         return event
 
 
-class ProtocolHandler(object):
+class _ProtocolHandler(object):
     """
-    ProtocolHander handles encoding and decoding messages.
+    _ProtocolHander handles encoding and decoding messages.
 
     This class can be specialized to compose Handlers which implement alternative
     result decoding or type deserialization. Class definitions are passed to :class:`cassandra.cluster.Cluster`
     on initialization.
 
-    Contracted class methods are :meth:`ProtocolHandler.encode_message` and :meth:`ProtocolHandler.decode_message`.
+    Contracted class methods are :meth:`_ProtocolHandler.encode_message` and :meth:`_ProtocolHandler.decode_message`.
     """
 
     message_types_by_opcode = _message_types_by_opcode.copy()
@@ -1039,12 +1039,12 @@ class FastResultMessage(ResultMessage):
         code_to_type = dict((v, k) for k, v in ResultMessage.type_codes.items())
         recv_results_rows = classmethod(make_recv_results_rows(colparser))
 
-    class CythonProtocolHandler(ProtocolHandler):
+    class CythonProtocolHandler(_ProtocolHandler):
         """
         Use FastResultMessage to decode query result message messages.
         """
 
-        my_opcodes = ProtocolHandler.message_types_by_opcode.copy()
+        my_opcodes = _ProtocolHandler.message_types_by_opcode.copy()
         my_opcodes[FastResultMessage.opcode] = FastResultMessage
         message_types_by_opcode = my_opcodes
 
@@ -1059,6 +1059,7 @@ class CythonProtocolHandler(ProtocolHandler):
     LazyProtocolHandler = cython_protocol_handler(LazyParser())
 else:
     # Use Python-based ProtocolHandler
+    ProtocolHandler = _ProtocolHandler
     LazyProtocolHandler = None
 
 
diff --git a/docs/api/cassandra/protocol.rst b/docs/api/cassandra/protocol.rst
@@ -16,7 +16,7 @@ a custom QueryHandler.
 
 See :meth:`.Session.execute`, ::meth:`.Session.execute_async`, :attr:`.ResponseFuture.custom_payload`.
 
-.. autoclass:: ProtocolHandler
+.. autoclass:: _ProtocolHandler
 
     .. autoattribute:: message_types_by_opcode
         :annotation: = {default mapping}
