ppf: Remove return values in access.py.

diff --git a/ppf/db/access.py b/ppf/db/access.py
index 544a5e2..e741324 100644 (file)
--- a/ppf/db/access.py
+++ b/ppf/db/access.py
@@ -167,10 +167,8 @@ class SQLiteDatabaseAccess(DatabaseAccess):
                 for row in self.cursor:
                     print row
 
-            return self.cursor
         except sqlite3.Error, e:
             print("[swarms]An error ocurred: ", e.args[0])
-            return None
 
     def delete_swarms(self, swarm_id=None):
         try:
@@ -209,8 +207,6 @@ class SQLiteDatabaseAccess(DatabaseAccess):
             if show == True:
                 for row in self.cursor:
                     print row
-            else:
-                return self.cursor
         except sqlite3.Error, e:
             print ("[btclients]An error ocurred: ", e.args[0])
 
@@ -222,8 +218,6 @@ class SQLiteDatabaseAccess(DatabaseAccess):
             if show == True:
                 for row in self.cursor:
                     print row
-            else:
-                return self.cursor
         except sqlite3.Error, e:
             print ("[btclients]An error ocurred: ", e.args[0])
 
@@ -263,8 +257,6 @@ class SQLiteDatabaseAccess(DatabaseAccess):
             if show == True:
                 for row in self.cursor:
                     print row
-            else:
-                return self.cursor
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
@@ -294,8 +286,6 @@ class SQLiteDatabaseAccess(DatabaseAccess):
             if show == True:
                 for row in self.cursor:
                     print row
-            else:
-                return self.cursor
         except sqlite3.Error, e:
             print ("[client_sessions]An error ocurred: ", e.args[0])
 
@@ -366,14 +356,11 @@ class SQLiteDatabaseAccess(DatabaseAccess):
                         values += (value, )
 
                 query = query.strip('and ')
-                print query, values
                 self.cursor.execute(query, values)
 
             if show == True:
                 for row in self.cursor:
                     print row
-            else:
-                return self.cursor
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])
 
@@ -423,8 +410,6 @@ class SQLiteDatabaseAccess(DatabaseAccess):
             if show == True:
                 for row in self.cursor:
                     print row
-            else:
-                return self.cursor
         except sqlite3.Error, e:
             print("[status_messages]An error ocurred: ", e.args[0])
 

diff --git a/ppf/db/tests/test_access_sqlite.py b/ppf/db/tests/test_access_sqlite.py
index 65372d4..488194b 100644 (file)
--- a/ppf/db/tests/test_access_sqlite.py
+++ b/ppf/db/tests/test_access_sqlite.py
@@ -417,7 +417,6 @@ class AccessTest(unittest.TestCase):
         """
         Select bctlients id by name. "Tibler" should return be client id 1.
         """
-        # TODO: unify return values for select_* methods in access.py
         id = self.dba.select_btclients_id_by_name("Tribler")
         self.expected_btclients_count = 1