Merge pull request #115 from tvincentNuoDB/master

Increase code health

Author: mjmichaels

pynuodb/cursor.py

@@ -90,7 +90,8 @@ def _reset(self):
 
     def callproc(self, procname, parameters=None):
         """Currently not supported."""
-        raise NotSupportedError("Currently unsupported")
+        if(procname is not None or parameters is not None):
+            raise NotSupportedError("Currently unsupported")
 
     def execute(self, operation, parameters=None):
         """Executes an SQL operation.
@@ -258,4 +259,3 @@ def shutdown(self):
 
         self._ps_cache.clear()
         self._ps_key_queue.clear()
-

pynuodb/encodedsession.py

@@ -236,6 +236,9 @@ def test_connection(self):
         fieldValue = self.getInt()
         r2 = self.getInt()
 
+        if(rsHandle is None or count is None or colname is None or result is None or fieldValue is None or r2 is None):
+            raise ProgrammingError('Failed to connect!')
+
     # Mostly for cursors
     def create_statement(self):
         """
@@ -1076,4 +1079,4 @@ def isASCII(self, data):
     def getCommitInfo(self, nodeID):
         """ Currently does not support last commit """
 
-        return 0
+        return 0 * nodeID

pynuodb/entity.py

@@ -144,7 +144,6 @@ def find_peer(self, address, port=None):
             return self.__peers_by_addr[inet_sock_addr]
         except Exception as exception:
             print(exception.message)
-            pass
 
         session = Session(address, port=port, service="Identity")
         session.authorize(self.__user, self.__password)

test-performance/timesInsert.py

@@ -18,7 +18,7 @@
 
 smallIterationsInsertTime = time.clock()
 for i in range(smallIterations):
-	cursor.execute("INSERT INTO perf_test (a,b ) VALUES (%s,'A')" % i)
+	cursor.execute("INSERT INTO perf_test (a,b ) VALUES (%d,'A')" % i)
 connection.commit()
 smallIterationsInsertTime = time.clock() - smallIterationsInsertTime
 
@@ -38,7 +38,7 @@
 
 largeIterationsInsertTime = time.clock()
 for i in range(largeIterations):
-	cursor.execute("INSERT INTO perf_test (a,b ) VALUES (%s,'A')" % i)
+	cursor.execute("INSERT INTO perf_test (a,b ) VALUES (%d,'A')" % i)
 connection.commit()
 largeIterationsInsertTime = time.clock() - largeIterationsInsertTime