Updated class defines to portability standards

Author: tvincentNuoDB

pynuodb/connection.py

@@ -59,7 +59,7 @@ class Connection(object):
     auto_commit (setter) -- Sets the value of auto_commit on the database.
     """
 
-    from .exception import Warning, Error, InterfaceError, DatabaseError, DataError, \
+    from .exception import Warning, Error, InterfaceError, DatabaseError, \
             OperationalError, IntegrityError, InternalError, \
             ProgrammingError, NotSupportedError
 

pynuodb/crypt.py

@@ -103,7 +103,7 @@ def fromByteString(byteStr):
     return result
 
 
-class RemoteGroup:
+class RemoteGroup(object):
 
     defaultPrime = "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C" + \
         "9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE4" + \
@@ -144,7 +144,7 @@ def getGenerator(self):
     def getK(self):
         return self.__k
 
-class RemotePassword:
+class RemotePassword(object):
 
     def __init__(self):
         self.__group = RemoteGroup()
@@ -258,7 +258,7 @@ def computeSessionKey(self, clientKey, verifier):
 
         return md.digest()
 
-class RC4Cipher:
+class RC4Cipher(object):
 
     def __init__(self, key):
         if systemVersion == '3':

pynuodb/entity.py

@@ -441,7 +441,7 @@ def _send_management_message(self, message, peer, process):
         self.__session.send(ElementTree.tostring(root))
 
 
-class Peer:
+class Peer(object):
     """Represents a peer (or host) in the domain."""
 
     def __init__(self, domain, address, agent_id, broker=False, port=48004, hostname=None, version=None):
@@ -760,7 +760,7 @@ def _get_normalized_addr(self):
             self.__inet_sock_addr = inet_sock_addr
         return self.__inet_sock_addr
 
-class Database:
+class Database(object):
 
     """Represents a NuoDB database."""
 
@@ -950,7 +950,7 @@ def __wait_for_status(self, status, wait_seconds):
 
         return False
 
-class Process:
+class Process(object):
 
     """Represents a NuoDB process (TE or SM)"""
 
@@ -1138,7 +1138,7 @@ def query(self, query_type, msg_body=None):
         return queryEngine(self.address, self.port, query_type, pwd, msg_body)
 
 
-class Template:
+class Template(object):
     success_message = "Success"
 
     @staticmethod

pynuodb/session.py

@@ -63,7 +63,7 @@ def __str__(self):
         return repr(self.__value)
 
 
-class Session:
+class Session(object):
 
     __AUTH_REQ = "<Authorize TargetService=\"%s\" Type=\"SRP\"/>"
     __SRP_REQ = "<SRPRequest ClientKey=\"%s\" Cipher=\"RC4\" Username=\"%s\"/>" #Why is this hard coded...
@@ -313,7 +313,7 @@ def close(self):
         self.__session.close(force=True)
 
 
-class BaseListener:
+class BaseListener(object):
 
     def message_received(self, root):
         pass

pynuodb/util.py

@@ -52,7 +52,7 @@ def message_received(self, root):
         print(ElementTree.tostring(root))
 
 
-class EngineMonitor:
+class EngineMonitor(object):
 
     def __init__(self, monitor, session):
         self.__monitor = monitor