helper_sql formating

src/helper_sql.py

@@ -1,22 +1,26 @@
+"""Helper Sql performs sql operations."""
+
 import threading
 import Queue
 
-sqlSubmitQueue = Queue.Queue() #SQLITE3 is so thread-unsafe that they won't even let you call it from different threads using your own locks. SQL objects can only be called from one thread.
+sqlSubmitQueue = Queue.Queue()  # SQLITE3 is so thread-unsafe that they won't
+# even let you call it from different threads using your own locks. SQL
+# objects #can only be called from one thread.
 sqlReturnQueue = Queue.Queue()
 sqlLock = threading.Lock()
 
+
 def sqlQuery(sqlStatement, *args):
     sqlLock.acquire()
     sqlSubmitQueue.put(sqlStatement)
 
     if args == ():
         sqlSubmitQueue.put('')
-    elif type(args[0]) in [list, tuple]:
+    elif isinstance(args[0], (list, tuple)):
         sqlSubmitQueue.put(args[0])
     else:
         sqlSubmitQueue.put(args)
-    
+    queryreturn, _ = sqlReturnQueue.get()
-    queryreturn, rowcount = sqlReturnQueue.get()
     sqlLock.release()
 
     return queryreturn
@@ -60,7 +64,6 @@ def sqlExecute(sqlStatement, *args):
         sqlSubmitQueue.put('')
     else:
         sqlSubmitQueue.put(args)
-    
     queryreturn, rowcount = sqlReturnQueue.get()
     sqlSubmitQueue.put('commit')
     sqlLock.release()
@@ -71,25 +74,27 @@ def sqlStoredProcedure(procName):
     sqlSubmitQueue.put(procName)
     sqlLock.release()
 
+
 class SqlBulkExecute:
     def __enter__(self):
         sqlLock.acquire()
         return self
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, exc_type, value, traceback):
         sqlSubmitQueue.put('commit')
         sqlLock.release()
 
-    def execute(self, sqlStatement, *args):
+    @staticmethod
+    def execute(sqlStatement, *args):
         sqlSubmitQueue.put(sqlStatement)
-        
         if args == ():
             sqlSubmitQueue.put('')
         else:
             sqlSubmitQueue.put(args)
         sqlReturnQueue.get()
 
-    def query(self, sqlStatement, *args):
+    @staticmethod
+    def query(sqlStatement, *args):
         sqlSubmitQueue.put(sqlStatement)
 
         if args == ():
@@ -97,4 +102,3 @@ class SqlBulkExecute:
         else:
             sqlSubmitQueue.put(args)
         return sqlReturnQueue.get()
-