From ddeb7536623ebbd916c0d5af4130e99742578d99 Mon Sep 17 00:00:00 2001
From: Mark Florisson <markflorisson88@gmail.com>
Date: Wed, 5 Aug 2015 20:21:31 +0100
Subject: [PATCH] Some more small fixes

---
 cassandra/numpyparser.pyx | 2 +-
 cassandra/objparser.pyx   | 8 +-------
 cassandra/parsing.pxd     | 2 +-
 cassandra/parsing.pyx     | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cassandra/numpyparser.pyx b/cassandra/numpyparser.pyx
index 149843a6..7be86400 100644
--- a/cassandra/numpyparser.pyx
+++ b/cassandra/numpyparser.pyx
@@ -126,7 +126,7 @@ cdef inline int unpack_row(
         arr = arrays[i]
 
         if arr.is_object:
-            deserializer = desc.datatypes[i]
+            deserializer = desc.deserializers[i]
             val = deserializer.deserialize(&buf, desc.protocol_version)
             Py_INCREF(val)
             (<PyObject **> arr.buf_ptr)[0] = <PyObject *> val
diff --git a/cassandra/objparser.pyx b/cassandra/objparser.pyx
index 62723ceb..e98a991e 100644
--- a/cassandra/objparser.pyx
+++ b/cassandra/objparser.pyx
@@ -54,12 +54,6 @@ cdef class TupleRowParser(RowParser):
     Parse a single returned row into a tuple of objects:
 
         (obj1, ..., objN)
-
-    Attributes
-    ===========
-    datatypes:
-        this is a memoryview of N DataType objects that can deserialize bytes
-        into objects
     """
 
     cpdef unpack_row(self, BytesIOReader reader, ParseDesc desc):
@@ -73,7 +67,7 @@ cdef class TupleRowParser(RowParser):
             get_buf(reader, &buf)
 
             # Deserialize bytes to python object
-            deserializer = desc.datatypes[i]
+            deserializer = desc.deserializers[i]
             val = deserializer.deserialize(&buf, desc.protocol_version)
 
             # Insert new object into tuple
diff --git a/cassandra/parsing.pxd b/cassandra/parsing.pxd
index 40043f29..13bc8411 100644
--- a/cassandra/parsing.pxd
+++ b/cassandra/parsing.pxd
@@ -4,7 +4,7 @@ from cassandra.deserializers cimport Deserializer
 cdef class ParseDesc:
     cdef public object colnames
     cdef public object coltypes
-    cdef Deserializer[::1] datatypes
+    cdef Deserializer[::1] deserializers
     cdef public object protocol_version
     cdef Py_ssize_t rowsize
 
diff --git a/cassandra/parsing.pyx b/cassandra/parsing.pyx
index 71196d14..c9afd4b5 100644
--- a/cassandra/parsing.pyx
+++ b/cassandra/parsing.pyx
@@ -5,10 +5,10 @@ Module containing the definitions and declarations (parsing.pxd) for parsers.
 cdef class ParseDesc:
     """Description of what structure to parse"""
 
-    def __init__(self, colnames, coltypes, datatypes, protocol_version):
+    def __init__(self, colnames, coltypes, deserializers, protocol_version):
         self.colnames = colnames
         self.coltypes = coltypes
-        self.datatypes = datatypes
+        self.deserializers = deserializers
         self.protocol_version = protocol_version
         self.rowsize = len(colnames)