Merge pull request #51 from maciejlach/master

Fix: serialization of 0n in generic lists (when Pandas package is installed) (#50)

CHANGELOG.txt

@@ -2,7 +2,8 @@
   qPython 1.3.0 [2017.03.xx]
 ------------------------------------------------------------------------------
 
-  - Add support for Python 3.5 and 3.6. Drop support for Python 3.3.
+  - Add support for Python 3.5 and 3.6. Drop support for Python 3.3
+  - Fix: serialization of 0n in generic lists
 
 ------------------------------------------------------------------------------
   qPython 1.2.2 [2016.09.21]

qpython/_pandas.py

@@ -211,7 +211,10 @@ def _write_pandas_data_frame(self, data, qtype = None):
 
     @serialize(tuple, list)
     def _write_generic_list(self, data):
-        self._buffer.write(struct.pack('=bxi', QGENERAL_LIST, len(data)))
-        for element in data:
-            # assume nan represents a string null
-            self._write(' ' if type(element) in [float, numpy.float32, numpy.float64] and numpy.isnan(element) else element)
+        if self._options.pandas:
+            self._buffer.write(struct.pack('=bxi', QGENERAL_LIST, len(data)))
+            for element in data:
+                # assume nan represents a string null
+                self._write(' ' if type(element) in [float, numpy.float32, numpy.float64] and numpy.isnan(element) else element)
+        else:
+            QWriter._write_generic_list(self, data)

tests/pandas_test.py

@@ -312,7 +312,7 @@ def test_writing_pandas():
                 data.meta = value['meta']
             else:
                 data = value
-            serialized = binascii.hexlify(w.write(data, 1, single_char_strings = single_char_strings))[16:].lower()
+            serialized = binascii.hexlify(w.write(data, 1, single_char_strings = single_char_strings, pandas = True))[16:].lower()
             assert serialized == BINARY[query].lower(), 'serialization failed: %s, expected: %s actual: %s' % (value,  BINARY[query].lower(), serialized)
             sys.stdout.write( '.' )