More compliance for Python 3

tvincentNuoDB · tvincentNuoDB · commit d80cd4a2cb68 · 2015-06-05T10:42:41.000-04:00
diff --git a/pynuodb/crypt.py b/pynuodb/crypt.py
@@ -285,7 +285,8 @@ def transform(self, data):
         if type(data) is bytes:
             data.decode("latin-1")
         for char in data:
-
+            if type(char) is int:
+                char = chr(char)
             self.__idx1 = (self.__idx1 + 1) % 256
             self.__idx2 = (self.__idx2 + state[self.__idx1]) % 256
             state[self.__idx1], state[self.__idx2] = state[self.__idx2], state[self.__idx1]
diff --git a/pynuodb/encodedsession.py b/pynuodb/encodedsession.py
@@ -9,6 +9,7 @@
 import uuid
 import struct
 import decimal
+import sys
 
 from .crypt import toByteString, fromByteString, toSignedByteString, fromSignedByteString, NoCipher
 from .session import Session, SessionException
@@ -19,6 +20,8 @@
 from .statement import Statement, PreparedStatement, ExecutionResult
 from .result_set import ResultSet
 
+systemVersion = sys.version[0]
+
 class EncodedSession(Session):
     """Class for representing an encoded session with the database.
     
@@ -437,13 +440,17 @@ def putOpaque(self, value):
             packed = chr(protocol.OPAQUELEN0 + length) + data
         else:
             lengthStr = toByteString(length)
+            if systemVersion is '3':
+                data = data.decode('latin-1')
             packed = chr(protocol.OPAQUECOUNT1 - 1 + len(lengthStr)) + lengthStr + data
         self.__output += packed
         return self
 
     def putDouble(self, value):
         """Appends a Double to the message."""
         valueStr = struct.pack('!d', value)
+        if systemVersion is '3':
+            valueStr = valueStr.decode('latin-1')
         packed = chr(protocol.DOUBLELEN0 + len(valueStr)) + valueStr
         self.__output += packed
         return self
@@ -614,6 +621,8 @@ def getDouble(self):
             if typeCode < protocol.DOUBLELEN8:
                 for i in range(0, protocol.DOUBLELEN8 - typeCode):
                     test = test + chr(0)
+                if systemVersion is '3':
+                    return struct.unpack('!d', bytes(test, 'latin-1'))
             return struct.unpack('!d', test)[0]
             
         raise DataError('Not a double')
diff --git a/pynuodb/entity.py b/pynuodb/entity.py
@@ -260,7 +260,7 @@ def shutdown(self, graceful=True):
         graceful -- (default True) means that the database will first
         be quiesced and then shutdown.
         """
-        for database in self.__databases.itervalues():
+        for database in list(self.__databases.values()):
             database.shutdown(graceful)
 
     def message_received(self, root):
@@ -861,7 +861,7 @@ def shutdown(self, graceful=True):
         failure_count = 0
         failure_text = ""
 
-        for process in self.__processes.values():
+        for process in list(self.__processes.values()):
             if process.is_transactional:
                 try:
                     if graceful:
@@ -873,7 +873,7 @@ def shutdown(self, graceful=True):
                     failure_count = failure_count + 1
                     failure_text = failure_text + str(e) + "\n"
 
-        for process in self.__processes.values():
+        for process in list(self.__processes.values()):
             if not process.is_transactional:
                 try:
                     if graceful:
diff --git a/pynuodb/session.py b/pynuodb/session.py
@@ -246,6 +246,7 @@ def __readFully(self, msgLength):
             else:
                 msg = msg + received
                 msgLength = msgLength - len(received)
+
         return msg
 
     def close(self, force=False):
diff --git a/tests/nuodb_basic_test.py b/tests/nuodb_basic_test.py
@@ -45,7 +45,7 @@ def test_numeric_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], 0)
 
         finally:
@@ -71,7 +71,7 @@ def test_double_precision(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i - 1])
 
         finally:
@@ -95,7 +95,7 @@ def test_param_numeric_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i - 1])
 
         finally:
@@ -119,7 +119,7 @@ def test_param_numeric_types_pos(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i - 1])
 
         finally:
@@ -202,7 +202,7 @@ def test_param_numeric_types_neg(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i - 1])
 
         finally:
@@ -353,7 +353,7 @@ def test_string_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], '')
 
         finally:
@@ -379,7 +379,7 @@ def test_param_string_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i-1])
 
         finally:
@@ -407,7 +407,7 @@ def test_long_string_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i-1])
 
         finally:
@@ -432,7 +432,7 @@ def test_utf8_string_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i-1])
 
 
@@ -638,7 +638,7 @@ def test_other_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i-1])
         finally:
             try:
@@ -661,7 +661,7 @@ def test_param_other_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, len(row)):
+            for i in range(1, len(row)):
                 self.assertEqual(row[i], test_vals[i-1])
         finally:
             try:
@@ -825,7 +825,7 @@ def test_all_types(self):
             cursor.execute("select * from typetest order by id desc limit 1")
             row = cursor.fetchone()
 
-            for i in xrange(1, 3):
+            for i in range(1, 3):
                 self.assertEqual(row[i], vals[i - 1])
 
             self.assertIsInstance(row[3], pynuodb.Timestamp)
@@ -849,7 +849,7 @@ def test_all_types(self):
             self.assertEqual(row[5].month, vals[4].month)
             self.assertEqual(row[5].day, vals[4].day)
 
-            for i in xrange(6, len(row)):
+            for i in range(6, len(row)):
                 self.assertEqual(row[i], vals[i - 1])
 
         finally:
diff --git a/tests/nuodb_blob_test.py b/tests/nuodb_blob_test.py
@@ -4,8 +4,10 @@
 from struct import *
 
 import pynuodb
+import sys
 from .nuodb_base import NuoBase
 
+systemVersion = sys.version[0]
 
 class NuoDBBlobTest(NuoBase):
     def test_blob_prepared(self):
@@ -16,15 +18,21 @@ def test_blob_prepared(self):
 
         cursor.execute("SELECT ? FROM DUAL", [binary_data])
         row = cursor.fetchone()
-
-        array1 = unpack('hhl', row[0])
+        
+        currentRow = row[0]
+        if systemVersion is '3':
+            currentRow = bytes(currentRow, 'latin-1')
+        array1 = unpack('hhl', currentRow)
         self.assertEquals(len(array1), 3)
         self.assertEquals(array1[2], 3)
 
         cursor.execute("SELECT ? FROM DUAL", [pynuodb.Binary(binary_data)])
         row = cursor.fetchone()
 
-        array2 = unpack('hhl', str(row[0]))
+        currentRow = str(row[0])
+        if systemVersion is '3':
+            currentRow = bytes(currentRow, 'latin-1')
+        array2 = unpack('hhl', currentRow)
         self.assertEquals(len(array2), 3)
         self.assertEquals(array2[2], 3)
 
