Don't reference cython genexp from core modules

aholmberg · aholmberg · commit 8b5b0c2dffc6 · 2015-11-10T16:09:47.000-06:00
Fixes a not-well-understood issue that would cause segfualts when
building with Cython &lt; 0.22
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -19,7 +19,7 @@
 from __future__ import absolute_import
 
 import atexit
-from collections import defaultdict
+from collections import defaultdict, Mapping
 from concurrent.futures import ThreadPoolExecutor
 import logging
 from random import random
@@ -61,7 +61,7 @@
                                 BatchMessage, RESULT_KIND_PREPARED,
                                 RESULT_KIND_SET_KEYSPACE, RESULT_KIND_ROWS,
                                 RESULT_KIND_SCHEMA_CHANGE, MIN_SUPPORTED_VERSION,
-                                ProtocolHandler, _RESULT_SEQUENCE_TYPES)
+                                ProtocolHandler)
 from cassandra.metadata import Metadata, protect_name, murmur3
 from cassandra.policies import (TokenAwarePolicy, DCAwareRoundRobinPolicy, SimpleConvictionPolicy,
                                 ExponentialReconnectionPolicy, HostDistance,
@@ -3348,9 +3348,13 @@ def fetch_next_page(self):
             self._current_rows = []
 
     def _set_current_rows(self, result):
-        if isinstance(result, _RESULT_SEQUENCE_TYPES):
+        if isinstance(result, Mapping):
+            self._current_rows = [result] if result else []
+            return
+        try:
+            iter(result)  # can't check directly for generator types because cython generators are different
             self._current_rows = result
-        else:
+        except TypeError:
             self._current_rows = [result] if result else []
 
     def _fetch_all(self):
diff --git a/cassandra/obj_parser.pyx b/cassandra/obj_parser.pyx
@@ -38,17 +38,13 @@ cdef class LazyParser(ColumnParser):
         # supported in cpdef methods
         return parse_rows_lazy(reader, desc)
 
-    cpdef get_cython_generator_type(self):
-        return get_cython_generator_type()
 
 def parse_rows_lazy(BytesIOReader reader, ParseDesc desc):
     cdef Py_ssize_t i, rowcount
     rowcount = read_int(reader)
     cdef RowParser rowparser = TupleRowParser()
     return (rowparser.unpack_row(reader, desc) for i in range(rowcount))
 
-def get_cython_generator_type():
-    return type((i for i in range(0)))
 
 cdef class TupleRowParser(RowParser):
     """
diff --git a/cassandra/protocol.py b/cassandra/protocol.py
@@ -1000,8 +1000,6 @@ def decode_message(cls, protocol_version, user_type_map, stream_id, flags, opcod
 
         return msg
 
-_RESULT_SEQUENCE_TYPES = (list, tuple)  # types retuned by ResultMessages
-
 def cython_protocol_handler(colparser):
     """
     Given a column parser to deserialize ResultMessages, return a suitable
@@ -1046,9 +1044,6 @@ class CythonProtocolHandler(ProtocolHandler):
 if HAVE_CYTHON:
     from cassandra.obj_parser import ListParser, LazyParser
     ProtocolHandler = cython_protocol_handler(ListParser())
-
-    lazy_parser = LazyParser()
-    _RESULT_SEQUENCE_TYPES += (lazy_parser.get_cython_generator_type(),)
     LazyProtocolHandler = cython_protocol_handler(LazyParser())
 else:
     # Use Python-based ProtocolHandler
