Merge pull request #103 from tvincentNuoDB/master

Fixed large dataset tests on Python 3

Author: tvincentNuoDB

pynuodb/protocol.py

@@ -329,8 +329,7 @@ def lookup_code(error_code):
 # NuoDB Client-Server Protocol Version #'s
 #
 PROTOCOL_VERSION1          = 1
-PROTOCOL_VERSION2          = 2   # 3/27/2011    Passing SQLState on exceptions; piggybacking generated
-                                 #              key result sets.
+PROTOCOL_VERSION2          = 2   # 3/27/2011    Passing SQLState on exceptions; piggybacking generated key result sets.
 PROTOCOL_VERSION3          = 3   # 2/14/2012    Passing txn, node id and commit sequence
 PROTOCOL_VERSION4          = 4   # 2/29/2012    Added GetCurrentSchema
 PROTOCOL_VERSION5          = 5   # 3/12/2012    Server returns DB UUID

pynuodb/session.py

@@ -214,10 +214,7 @@ def recv(self, doStrip=True):
 
         try:
             lengthHeader = self.__readFully(4)
-            if self.__version == '3':
-                lengthHeader = bytes(lengthHeader, 'latin-1')
             msgLength = int(struct.unpack("!I", lengthHeader)[0])
-            
             msg = self.__readFully(msgLength)
 
 
@@ -230,23 +227,25 @@ def recv(self, doStrip=True):
                 msg = self.__cipherIn.transform(msg).lstrip()
             else:
                 msg = self.__cipherIn.transform(msg)
+
+        if type(msg) is bytes and self.__version == '3':
+            msg = msg.decode("latin-1")
         return msg
 
 
     def __readFully(self, msgLength):
-        msg = ""
+        msg = b''
         while msgLength > 0:
             received = self.__sock.recv(msgLength)
             if not received:
                 raise SessionException("Session was closed while receiving msgLength=[%d] len(msg)=[%d] "
                                        "len(received)=[%d]" % (msgLength, len(msg), len(received)))
             if self.__version == '3':
-                msg = received.decode('latin-1')
-                msgLength = msgLength - len(msg)
+                msg = b''.join([msg, received])
+                msgLength = msgLength - len(received.decode('latin-1'))
             else:
                 msg = msg + received
                 msgLength = msgLength - len(received)
-
         return msg
 
     def close(self, force=False):

test_requirements.txt

@@ -4,4 +4,4 @@ pytest>=2.7
 coverage>=3.7
 pytest-cov>=1.8.1
 coveralls>=0.5
-python-coveralls>=2.5.0
+python-coveralls>=2.5