Multiple fixes for pep8 and python3

pwman/data/drivers/mysql.py

@@ -1,25 +1,26 @@
-#============================================================================
+# ============================================================================
 # This file is part of Pwman3.
-# 
+#
 # Pwman3 is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2
-# as published by the Free Software Foundation; 
-# 
+# as published by the Free Software Foundation;
+#
 # Pwman3 is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with Pwman3; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#============================================================================
+# ============================================================================
 # Copyright (C) 2012 Oz Nahum <nahumoz@gmail.com>
-#============================================================================
+# ============================================================================
 # Copyright (C) 2006 Ivan Kelly <ivan@ivankelly.net>
-#============================================================================
+# ============================================================================
 
 """MySQL Database implementation."""
+from __future__ import print_function
 from pwman.data.database import Database, DatabaseException
 from pwman.data.nodes import Node
 from pwman.data.tags import Tag
@@ -28,19 +29,20 @@ import MySQLdb
 import pwman.util.config as config
 import cPickle
 
+
 class MySQLDatabase(Database):
     """MySQL Database implementation"""
-    
+
     def __init__(self):
         """Initialise MySQLDatabase instance."""
         Database.__init__(self)
 
         self._tagidcache = {}
-        
-        config.add_defaults({"Database" : {"server": "localhost",
-                                           "port"  : "3306",
-                                           "database" : "pwman",
-                                           "table_prefix" : "pwman_"}})
+
+        config.add_defaults({"Database": {"server": "localhost",
+                                          "port": "3306",
+                                          "database": "pwman",
+                                          "table_prefix": "pwman_"}})
         try:
             self._server = config.get_value('Database', 'server')
             self._port = config.get_value('Database', 'port')
@@ -55,27 +57,22 @@ class MySQLDatabase(Database):
     def _open(self):
         try:
             self._con = None
-#            server = "%s:%s" % (self._server, self._port)
-#            self._con = pgdb.connect(host = server,
-#                                     database = self._database,
-#                                     user = self._user,
-#                                     password = self._password)
-#            self._cur = self._con.cursor()
             self._checktables()
         except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
 
     def _get_cur(self):
         try:
-            if (self._con != None):
+            if self._con:
                 return self._con.cursor()
-        except MySQLdb.DatabaseError as e:
+        except MySQLdb.DatabaseError:
             pass
-        self._con = MySQLdb.connect(host = self._server,
-                                 port = int(self._port),
-                                 db = self._database,
-                                 user = self._user,
-                                 passwd = self._password)
+
+        self._con = MySQLdb.connect(host=self._server,
+                                    port=int(self._port),
+                                    db=self._database,
+                                    user=self._user,
+                                    passwd=self._password)
         self._cur = self._con.cursor()
         return self._cur
 
@@ -91,9 +88,9 @@ class MySQLDatabase(Database):
             sql = "SELECT DATA FROM %sTAGS ORDER BY DATA ASC" % (self._prefix)
         else:
             sql = ("SELECT %sTAGS.DATA FROM %sLOOKUP"
-                   +" INNER JOIN %sTAGS ON %sLOOKUP.TAG = %sTAGS.ID"
-                   +" WHERE NODE IN (") % (self._prefix, self._prefix, self._prefix,
-                                           self._prefix, self._prefix)
+                   " INNER JOIN %sTAGS ON %sLOOKUP.TAG = %sTAGS.ID"
+                   " WHERE NODE IN (") % (self._prefix, self._prefix, self._prefix,
+                                          self._prefix, self._prefix)
             first = True
 
             i += 1
@@ -103,12 +100,12 @@ class MySQLDatabase(Database):
                     sql += " INTERSECT "
                 else:
                     first = False
-                
+
                 sql += ("SELECT NODE FROM %sLOOKUP LEFT JOIN %sTAGS ON TAG = %sTAGS.ID "
                         + " WHERE %sTAGS.DATA = %%s") % (self._prefix, self._prefix,
-                                                             self._prefix, self._prefix)
+                                                         self._prefix, self._prefix)
                 params.append(cPickle.dumps(t))
-            sql += ") EXCEPT SELECT DATA FROM %sTAGS WHERE " %(self._prefix)
+            sql += ") EXCEPT SELECT DATA FROM %sTAGS WHERE " % (self._prefix)
             first = True
             for t in self._filtertags:
                 if not first:
@@ -123,36 +120,36 @@ class MySQLDatabase(Database):
 
             tags = []
             row = cursor.fetchone()
-            while (row != None):
+            while row is not None:
                 tag = cPickle.loads(str(row[0]))
                 tags.append(tag)
                 row = cursor.fetchone()
             return tags
         except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
-        
+
     def getnodes(self, ids):
         nodes = []
         idstr = ""
         first = True
         if len(ids) == 0:
             idstr = "-1"
-            
+
         for i in ids:
             if first:
                 idstr += "%d" % (i)
                 first = False
             else:
                 idstr += ", %d" % (i)
-            
+
         sql = "SELECT ID,DATA FROM %sNODES WHERE ID IN (%s)" % (self._prefix,
                                                                 MySQLdb.escape_string(idstr))
         try:
             cursor = self._get_cur()
             cursor.execute(sql)
-            
+
             row = cursor.fetchone()
-            while row != None:
+            while row is not None:
                 node = cPickle.loads(str(row[1]))
                 node.set_id(row[0])
                 nodes.append(node)
@@ -162,13 +159,13 @@ class MySQLDatabase(Database):
         return nodes
 
     def editnode(self, id, node):
-        if not isinstance(node, Node): raise DatabaseException(
-                "Tried to insert foreign object into database [%s]" % node)
+        if not isinstance(node, Node):
+            raise DatabaseException("Tried to insert foreign object into database [%s]" % node)
         try:
             cursor = self._get_cur()
             sql = "UPDATE %sNODES SET DATA = %%s WHERE ID = %%s" % (self._prefix)
             cursor.execute(sql, (cPickle.dumps(node), id))
-            
+
         except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
         self._setnodetags(node)
@@ -179,29 +176,29 @@ class MySQLDatabase(Database):
         cursor = self._get_cur()
         for n in nodes:
             sql = "INSERT INTO %sNODES(DATA) VALUES(%%s)" % (self._prefix)
-            if not isinstance(n, Node): raise DatabaseException(
-                "Tried to insert foreign object into database [%s]", n)
+            if not isinstance(n, Node):
+                raise DatabaseException("Tried to insert foreign object into database [%s]", n)
             values = [cPickle.dumps(n)]
             try:
                 cursor.execute(sql, values)
             except MySQLdb.DatabaseError as e:
                 raise DatabaseException("MySQL: %s" % (e))
             id = cursor.lastrowid
-            print "id: %d" % (id)
+            print("id: %d" % (id))
             n.set_id(id)
 
             self._setnodetags(n)
         self._commit()
-            
+
     def removenodes(self, nodes):
         cursor = self._get_cur()
         for n in nodes:
-            if not isinstance(n, Node): raise DatabaseException(
-                "Tried to delete foreign object from database [%s]", n)
+            if not isinstance(n, Node):
+                raise DatabaseException("Tried to delete foreign object from database [%s]", n)
             try:
                 sql = "DELETE FROM %sNODES WHERE ID = %%s" % (self._prefix)
                 cursor.execute(sql, [n.get_id()])
-                
+
             except MySQLdb.DatabaseError as e:
                 raise DatabaseException("MySQL: %s" % (e))
             self._deletenodetags(n)
@@ -230,12 +227,12 @@ class MySQLDatabase(Database):
                                                            self._prefix, self._prefix))
                 params.append(cPickle.dumps(t))
         try:
-            print sql
+            print(sql)
             cursor.execute(sql, params)
 
             ids = []
             row = cursor.fetchone()
-            while (row != None):
+            while (row is not None):
                 ids.append(row[0])
                 row = cursor.fetchone()
             return ids
@@ -259,16 +256,16 @@ class MySQLDatabase(Database):
                 ids.append(self._tagidcache[pickled])
                 continue
             except KeyError as e:
-                pass # not in cache
+                pass  # not in cache
             sql = "SELECT ID FROM %sTAGS WHERE DATA = %%s" % (self._prefix)
-            if not isinstance(t, Tag): raise DatabaseException(
-                "Tried to insert foreign object into database [%s]", t)
-            data = [ pickled ]
-            
+            if not isinstance(t, Tag):
+                raise DatabaseException("Tried to insert foreign object into database [%s]", t)
+            data = [pickled]
+
             try:
                 cursor.execute(sql, data)
                 row = cursor.fetchone()
-                if (row != None):
+                if (row is not None):
                     ids.append(row[0])
                     self._tagidcache[pickled] = row[0]
                 else:
@@ -286,18 +283,18 @@ class MySQLDatabase(Database):
             cursor = self._get_cur()
             sql = "DELETE FROM %sLOOKUP WHERE NODE = %%s" % (self._prefix)
             cursor.execute(sql, [node.get_id()])
-            
+
         except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQLdb: %s" % (e))
-        
+
     def _setnodetags(self, node):
         self._deletenodetags(node)
         ids = self._tagids(node.get_tags())
-        
+
         for i in ids:
             sql = "INSERT INTO %sLOOKUP VALUES(%%s, %%s)" % (self._prefix)
-            params = [ node.get_id(), i ]
-            
+            params = [node.get_id(), i]
+
             try:
                 cursor = self._get_cur()
                 cursor.execute(sql, params)
@@ -323,25 +320,25 @@ class MySQLDatabase(Database):
             "SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '%sNODES'"
             % (self._prefix))
 
-        if (cursor.fetchone() == None):
+        if (cursor.fetchone() is None):
             # table doesn't exist, create it
-            cursor.execute(("CREATE TABLE %sNODES" 
-                               +"(ID INT AUTO_INCREMENT PRIMARY KEY, DATA TEXT NOT NULL)")
-                              % (self._prefix))
-            cursor.execute(("CREATE TABLE %sTAGS"
-                               + "(ID INT AUTO_INCREMENT PRIMARY KEY,"
-                               + "DATA VARCHAR(255) NOT NULL UNIQUE)")
-                              % (self._prefix))
+            cursor.execute(("CREATE TABLE %sNODES "
+                            "(ID INT AUTO_INCREMENT PRIMARY KEY, DATA TEXT NOT NULL)")
+                           % (self._prefix))
+            cursor.execute(("CREATE TABLE %sTAGS "
+                            "(ID INT AUTO_INCREMENT PRIMARY KEY, "
+                            "DATA VARCHAR(255) NOT NULL UNIQUE)")
+                           % (self._prefix))
             cursor.execute(("CREATE TABLE %sLOOKUP"
-                               + "(NODE INTEGER NOT NULL, TAG INTEGER NOT NULL,"
-                               + " PRIMARY KEY(NODE, TAG))")
-                              % (self._prefix))
+                            "(NODE INTEGER NOT NULL, TAG INTEGER NOT NULL,"
+                            " PRIMARY KEY(NODE, TAG))")
+                           % (self._prefix))
 
-            cursor.execute(("CREATE TABLE %sKEY"
-                               + "(THEKEY TEXT(1024) NOT NULL DEFAULT '')")
-                              % (self._prefix))
+            cursor.execute(("CREATE TABLE %sKEY "
+                            "(THEKEY TEXT(1024) NOT NULL DEFAULT '')")
+                           % (self._prefix))
             cursor.execute("INSERT INTO %sKEY VALUES('')" % (self._prefix))
-            
+
             try:
                 self._con.commit()
             except MySQLdb.DatabaseError as e:
@@ -350,7 +347,7 @@ class MySQLDatabase(Database):
 
     def savekey(self, key):
         sql = "UPDATE %sKEY SET THEKEY = %%s" % (self._prefix)
-        values = ( key )
+        values = (key)
         cursor = self._get_cur()
         cursor.execute(sql, values)
         try:
@@ -359,8 +356,7 @@ class MySQLDatabase(Database):
             self._con.rollback()
             raise DatabaseException(
                 "MySQL: Error saving key [%s]" % (e))
-        
-        
+
     def loadkey(self):
         cursor = self._get_cur()
         cursor.execute("SELECT THEKEY FROM %sKEY" % (self._prefix))