Pep-3110 - Exception handling

pwman/data/convertdb.py

@@ -43,7 +43,7 @@ class SQLiteDatabaseReader(Database):
 
         try:
             self._filename = config.get_value('Database', 'filename')
-        except KeyError, e:
+        except KeyError as e:
             raise DatabaseException(
                 "SQLite: missing parameter [%s]" % (e))
 
@@ -52,7 +52,7 @@ class SQLiteDatabaseReader(Database):
             self._con = sqlite.connect(self._filename)
             self._cur = self._con.cursor()
             self._checktables()
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
 
     def close(self):
@@ -71,7 +71,7 @@ class SQLiteDatabaseReader(Database):
                     node = cPickle.loads(str(row[0]))
                     node.set_id(i)
                     nodes.append(node)
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
         return nodes
 
@@ -101,13 +101,13 @@ class SQLiteDatabaseReader(Database):
                 ids.append(row[0])
                 row = self._cur.fetchone()
             return ids
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
 
     def _commit(self):
         try:
             self._con.commit()
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "SQLite: Error commiting data to db [%s]" % (e))
@@ -130,7 +130,7 @@ class SQLiteDatabaseReader(Database):
                     sql = "INSERT INTO TAGS(DATA) VALUES(?)"
                     self._cur.execute(sql, [data])
                     ids.append(self._cur.lastrowid)
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
         return ids
 
@@ -156,7 +156,7 @@ class SQLiteDatabaseReader(Database):
             self._cur.execute("INSERT INTO KEY VALUES('')")
             try:
                 self._con.commit()
-            except DatabaseException, e:
+            except DatabaseException as e:
                 self._con.rollback()
                 raise e
 

pwman/data/drivers/mysql.py

@@ -48,7 +48,7 @@ class MySQLDatabase(Database):
             self._password = config.get_value('Database', 'password')
             self._database = config.get_value('Database', 'database')
             self._prefix = config.get_value('Database', 'table_prefix')
-        except KeyError, e:
+        except KeyError as e:
             raise DatabaseException(
                 "MySQL: missing parameter [%s]" % (e))
 
@@ -62,14 +62,14 @@ class MySQLDatabase(Database):
 #                                     password = self._password)
 #            self._cur = self._con.cursor()
             self._checktables()
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
 
     def _get_cur(self):
         try:
             if (self._con != None):
                 return self._con.cursor()
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             pass
         self._con = MySQLdb.connect(host = self._server,
                                  port = int(self._port),
@@ -128,7 +128,7 @@ class MySQLDatabase(Database):
                 tags.append(tag)
                 row = cursor.fetchone()
             return tags
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
         
     def getnodes(self, ids):
@@ -157,7 +157,7 @@ class MySQLDatabase(Database):
                 node.set_id(row[0])
                 nodes.append(node)
                 row = cursor.fetchone()
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
         return nodes
 
@@ -169,7 +169,7 @@ class MySQLDatabase(Database):
             sql = "UPDATE %sNODES SET DATA = %%s WHERE ID = %%s" % (self._prefix)
             cursor.execute(sql, (cPickle.dumps(node), id))
             
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
         self._setnodetags(node)
         self._checktags()
@@ -184,7 +184,7 @@ class MySQLDatabase(Database):
             values = [cPickle.dumps(n)]
             try:
                 cursor.execute(sql, values)
-            except MySQLdb.DatabaseError, e:
+            except MySQLdb.DatabaseError as e:
                 raise DatabaseException("MySQL: %s" % (e))
             id = cursor.lastrowid
             print "id: %d" % (id)
@@ -202,7 +202,7 @@ class MySQLDatabase(Database):
                 sql = "DELETE FROM %sNODES WHERE ID = %%s" % (self._prefix)
                 cursor.execute(sql, [n.get_id()])
                 
-            except MySQLdb.DatabaseError, e:
+            except MySQLdb.DatabaseError as e:
                 raise DatabaseException("MySQL: %s" % (e))
             self._deletenodetags(n)
 
@@ -239,13 +239,13 @@ class MySQLDatabase(Database):
                 ids.append(row[0])
                 row = cursor.fetchone()
             return ids
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
 
     def _commit(self):
         try:
             self._con.commit()
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "MySQL: Error commiting data to db [%s]" % (e))
@@ -258,7 +258,7 @@ class MySQLDatabase(Database):
             try:
                 ids.append(self._tagidcache[pickled])
                 continue
-            except KeyError, e:
+            except KeyError as e:
                 pass # not in cache
             sql = "SELECT ID FROM %sTAGS WHERE DATA = %%s" % (self._prefix)
             if not isinstance(t, Tag): raise DatabaseException(
@@ -277,7 +277,7 @@ class MySQLDatabase(Database):
                     id = cursor.lastrowid
                     ids.append(id)
                     self._tagidcache[pickled] = id
-            except MySQLdb.DatabaseError, e:
+            except MySQLdb.DatabaseError as e:
                 raise DatabaseException("MySQLdb: %s" % (e))
         return ids
 
@@ -287,7 +287,7 @@ class MySQLDatabase(Database):
             sql = "DELETE FROM %sLOOKUP WHERE NODE = %%s" % (self._prefix)
             cursor.execute(sql, [node.get_id()])
             
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQLdb: %s" % (e))
         
     def _setnodetags(self, node):
@@ -301,7 +301,7 @@ class MySQLDatabase(Database):
             try:
                 cursor = self._get_cur()
                 cursor.execute(sql, params)
-            except MySQLdb.DatabaseError, e:
+            except MySQLdb.DatabaseError as e:
                 raise DatabaseException("MySQLdb: %s" % (e))
 
     def _checktags(self):
@@ -312,7 +312,7 @@ class MySQLDatabase(Database):
                    + "(SELECT TAG FROM %sLOOKUP GROUP BY TAG)") % (self._prefix,
                                                                    self._prefix)
             cursor.execute(sql)
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             raise DatabaseException("MySQL: %s" % (e))
         self._commit()
 
@@ -344,7 +344,7 @@ class MySQLDatabase(Database):
             
             try:
                 self._con.commit()
-            except MySQLdb.DatabaseError, e:
+            except MySQLdb.DatabaseError as e:
                 self._con.rollback()
                 raise e
 
@@ -355,7 +355,7 @@ class MySQLDatabase(Database):
         cursor.execute(sql, values)
         try:
             self._con.commit()
-        except MySQLdb.DatabaseError, e:
+        except MySQLdb.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "MySQL: Error saving key [%s]" % (e))

pwman/data/drivers/postgresql.py

@@ -49,7 +49,7 @@ class PostgresqlDatabase(Database):
             self._password = config.get_value('Database', 'password')
             self._database = config.get_value('Database', 'database')
             self._prefix = config.get_value('Database', 'table_prefix')
-        except KeyError, e:
+        except KeyError as e:
             raise DatabaseException(
                 "Postgresql: missing parameter [%s]" % (e))
 
@@ -63,14 +63,14 @@ class PostgresqlDatabase(Database):
 #                                     password = self._password)
 #            self._cur = self._con.cursor()
             self._checktables()
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
 
     def _get_cur(self):
         try:
             if (self._con != None):
                 return self._con.cursor()
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             pass
         server = "%s:%s" % (self._server, self._port)
         self._con = pgdb.connect(host = server,
@@ -129,7 +129,7 @@ class PostgresqlDatabase(Database):
                 tags.append(tag)
                 row = cursor.fetchone()
             return tags
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
         
     def getnodes(self, ids):
@@ -158,7 +158,7 @@ class PostgresqlDatabase(Database):
                 node.set_id(row[0])
                 nodes.append(node)
                 row = cursor.fetchone()
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
         return nodes
 
@@ -171,7 +171,7 @@ class PostgresqlDatabase(Database):
             cursor.execute(sql, {"data":cPickle.dumps(node),
                                  "id": id})
             
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
         self._setnodetags(node)
         self._checktags()
@@ -186,7 +186,7 @@ class PostgresqlDatabase(Database):
             values = {"data": cPickle.dumps(n)}
             try:
                 cursor.execute(sql, values)
-            except pgdb.DatabaseError, e:
+            except pgdb.DatabaseError as e:
                 raise DatabaseException("Postgresql: %s" % (e))
             id = self._lastrowid("NODES")
             n.set_id(id)
@@ -203,7 +203,7 @@ class PostgresqlDatabase(Database):
                 sql = "DELETE FROM %sNODES WHERE ID = %%(id)d" % (self._prefix)
                 cursor.execute(sql, {"id": n.get_id()})
                 
-            except pgdb.DatabaseError, e:
+            except pgdb.DatabaseError as e:
                 raise DatabaseException("Postgresql: %s" % (e))
             self._deletenodetags(n)
 
@@ -241,13 +241,13 @@ class PostgresqlDatabase(Database):
                 ids.append(row[0])
                 row = cursor.fetchone()
             return ids
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
 
     def _commit(self):
         try:
             self._con.commit()
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "Postgresql: Error commiting data to db [%s]" % (e))
@@ -260,7 +260,7 @@ class PostgresqlDatabase(Database):
             try:
                 ids.append(self._tagidcache[pickled])
                 continue
-            except KeyError, e:
+            except KeyError as e:
                 pass # not in cache
             sql = "SELECT ID FROM %sTAGS WHERE DATA = %%(tag)s" % (self._prefix)
             if not isinstance(t, Tag): raise DatabaseException(
@@ -279,7 +279,7 @@ class PostgresqlDatabase(Database):
                     id = self._lastrowid("TAGS")
                     ids.append(id)
                     self._tagidcache[pickled] = id
-            except pgdb.DatabaseError, e:
+            except pgdb.DatabaseError as e:
                 raise DatabaseException("Postgresql: %s" % (e))
         return ids
 
@@ -289,7 +289,7 @@ class PostgresqlDatabase(Database):
             sql = "DELETE FROM %sLOOKUP WHERE NODE = %%(node)d" % (self._prefix)
             cursor.execute(sql, {"node":node.get_id()})
             
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
         
     def _setnodetags(self, node):
@@ -303,7 +303,7 @@ class PostgresqlDatabase(Database):
             try:
                 cursor = self._get_cur()
                 cursor.execute(sql, params)
-            except pgdb.DatabaseError, e:
+            except pgdb.DatabaseError as e:
                 raise DatabaseException("Postgresql: %s" % (e))
 
     def _checktags(self):
@@ -314,7 +314,7 @@ class PostgresqlDatabase(Database):
                    + "(SELECT TAG FROM %sLOOKUP GROUP BY TAG)") % (self._prefix,
                                                                    self._prefix)
             cursor.execute(sql)
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             raise DatabaseException("Postgresql: %s" % (e))
         self._commit()
 
@@ -355,7 +355,7 @@ class PostgresqlDatabase(Database):
             
             try:
                 self._con.commit()
-            except pgdb.DatabaseError, e:
+            except pgdb.DatabaseError as e:
                 self._con.rollback()
                 raise e
 
@@ -366,7 +366,7 @@ class PostgresqlDatabase(Database):
         cursor.execute(sql, values)
         try:
             self._con.commit()
-        except pgdb.DatabaseError, e:
+        except pgdb.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "Postgresql: Error saving key [%s]" % (e))

pwman/data/drivers/sqlite.py

@@ -67,7 +67,7 @@ class SQLiteDatabaseNewForm(Database):
             self._con = sqlite.connect(self._filename)
             self._cur = self._con.cursor()
             self._checktables()
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
 
     def close(self):
@@ -108,9 +108,9 @@ class SQLiteDatabaseNewForm(Database):
             tags = [str(t[0]) for t in self._cur.fetchall()]
             return tags
 
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
-        except sqlite.InterfaceError, e:  # pragma: no cover
+        except sqlite.InterfaceError as e:  # pragma: no cover
             raise e
 
     def parse_node_string(self, string):
@@ -151,7 +151,7 @@ class SQLiteDatabaseNewForm(Database):
         try:
             sql = "UPDATE NODES SET DATA = ? WHERE ID = ?"
             self._cur.execute(sql, [node.dump_edit_to_db()[0], id])
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
         self._setnodetags(node)
         self._checktags()
@@ -167,7 +167,7 @@ class SQLiteDatabaseNewForm(Database):
             value = n.dump_edit_to_db()
             try:
                 self._cur.execute(sql, value)
-            except sqlite.DatabaseError, e:  # pragma: no cover
+            except sqlite.DatabaseError as e:  # pragma: no cover
                 raise DatabaseException("SQLite: %s" % (e))
             idx = self._cur.lastrowid
             n._id = idx
@@ -182,7 +182,7 @@ class SQLiteDatabaseNewForm(Database):
                 sql = "DELETE FROM NODES WHERE ID = ?"
                 self._cur.execute(sql, [n._id])
 
-            except sqlite.DatabaseError, e:  # pragma: no cover
+            except sqlite.DatabaseError as e:  # pragma: no cover
                 raise DatabaseException("SQLite: %s" % (e))
             self._deletenodetags(n)
 
@@ -215,13 +215,13 @@ class SQLiteDatabaseNewForm(Database):
             rows = self._cur.fetchall()
             ids = [row[0] for row in rows]
             return ids
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
 
     def _commit(self):
         try:
             self._con.commit()
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             self._con.rollback()
             raise DatabaseException(
                 "SQLite: Error commiting data to db [%s]" % (e))
@@ -240,7 +240,7 @@ class SQLiteDatabaseNewForm(Database):
         try:
             sql = "DELETE FROM LOOKUP WHERE NODE = ?"
             self._cur.execute(sql, [node._id])
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
         self._commit()
 
@@ -249,7 +249,7 @@ class SQLiteDatabaseNewForm(Database):
         params = [node._id, tag_id]
         try:
             self._cur.execute(sql, params)
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
 
     def _tagids(self, tags):
@@ -269,7 +269,7 @@ class SQLiteDatabaseNewForm(Database):
                 else:
                     self._create_tag(tag)
                     ids.append(self._cur.lastrowid)
-            except sqlite.DatabaseError, e:  # pragma: no cover
+            except sqlite.DatabaseError as e:  # pragma: no cover
                 raise DatabaseException("SQLite: %s" % (e))
         return ids
 
@@ -284,7 +284,7 @@ class SQLiteDatabaseNewForm(Database):
             sql = "DELETE FROM TAGS WHERE ID NOT IN (SELECT TAG FROM" \
                 + " LOOKUP GROUP BY TAG)"
             self._cur.execute(sql)
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             raise DatabaseException("SQLite: %s" % (e))
         self._commit()
 
@@ -319,7 +319,7 @@ class SQLiteDatabaseNewForm(Database):
             self._cur.execute("INSERT INTO DBVERSION VALUES('0.4')")
             try:
                 self._con.commit()
-            except DatabaseException, e:  # pragma: no cover
+            except DatabaseException as e:  # pragma: no cover
                 self._con.rollback()
                 raise e
 
@@ -336,7 +336,7 @@ class SQLiteDatabaseNewForm(Database):
         self._cur.execute(sql, values)
         try:
             self._con.commit()
-        except sqlite.DatabaseError, e:  # pragma: no cover
+        except sqlite.DatabaseError as e:  # pragma: no cover
             self._con.rollback()
             raise DatabaseException(
                 "SQLite: Error saving key [%s]" % (e))

pwman/tests/test_converter.py

@@ -36,7 +36,7 @@ class SQLiteDatabase(Database):
 
         try:
             self._filename = fname
-        except KeyError, e:
+        except KeyError as e:
             raise DatabaseException(
                 "SQLite: missing parameter [%s]" % (e))
 
@@ -45,7 +45,7 @@ class SQLiteDatabase(Database):
             self._con = sqlite.connect(self._filename)
             self._cur = self._con.cursor()
             self._checktables()
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
 
     def close(self):
@@ -91,7 +91,7 @@ class SQLiteDatabase(Database):
                 tags.append(tag)
                 row = self._cur.fetchone()
             return tags
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
 
     def getnodes(self, ids):
@@ -106,7 +106,7 @@ class SQLiteDatabase(Database):
                     node = cPickle.loads(str(row[0]))
                     node.set_id(i)
                     nodes.append(node)
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
         return nodes
 
@@ -118,7 +118,7 @@ class SQLiteDatabase(Database):
             sql = "UPDATE NODES SET DATA = ? WHERE ID = ?"
             self._cur.execute(sql, [cPickle.dumps(node), id])
 
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
         self._setnodetags(node)
         self._checktags()
@@ -133,7 +133,7 @@ class SQLiteDatabase(Database):
             value = cPickle.dumps(n)
             try:
                 self._cur.execute(sql, [value])
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
             id = self._cur.lastrowid
             n.set_id(id)
@@ -150,7 +150,7 @@ class SQLiteDatabase(Database):
                 sql = "DELETE FROM NODES WHERE ID = ?"
                 self._cur.execute(sql, [n.get_id()])
 
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
             self._deletenodetags(n)
 
@@ -183,13 +183,13 @@ class SQLiteDatabase(Database):
                 ids.append(row[0])
                 row = self._cur.fetchone()
             return ids
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
 
     def _commit(self):
         try:
             self._con.commit()
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "SQLite: Error commiting data to db [%s]" % (e))
@@ -212,7 +212,7 @@ class SQLiteDatabase(Database):
                     sql = "INSERT INTO TAGS(DATA) VALUES(?)"
                     self._cur.execute(sql, [data])
                     ids.append(self._cur.lastrowid)
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
         return ids
 
@@ -221,7 +221,7 @@ class SQLiteDatabase(Database):
             sql = "DELETE FROM LOOKUP WHERE NODE = ?"
             self._cur.execute(sql, [node.get_id()])
 
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
         self._commit()
 
@@ -235,7 +235,7 @@ class SQLiteDatabase(Database):
 
             try:
                 self._cur.execute(sql, params)
-            except sqlite.DatabaseError, e:
+            except sqlite.DatabaseError as e:
                 raise DatabaseException("SQLite: %s" % (e))
         self._commit()
 
@@ -244,7 +244,7 @@ class SQLiteDatabase(Database):
             sql = ("DELETE FROM TAGS WHERE ID NOT "
                    "IN (SELECT TAG FROM LOOKUP GROUP BY TAG)")
             self._cur.execute(sql)
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             raise DatabaseException("SQLite: %s" % (e))
         self._commit()
 
@@ -271,7 +271,7 @@ class SQLiteDatabase(Database):
 
             try:
                 self._con.commit()
-            except DatabaseException, e:
+            except DatabaseException as e:
                 self._con.rollback()
                 raise e
 
@@ -281,7 +281,7 @@ class SQLiteDatabase(Database):
         self._cur.execute(sql, values)
         try:
             self._con.commit()
-        except sqlite.DatabaseError, e:
+        except sqlite.DatabaseError as e:
             self._con.rollback()
             raise DatabaseException(
                 "SQLite: Error saving key [%s]" % (e))

pwman/ui/tools.py

@@ -41,7 +41,7 @@ else:  # pragma: no cover
     try:
         import pyreadline as readline
         _readline_available = True
-    except ImportError, e:
+    except ImportError as e:
         _readline_available = False
 
 _defaultwidth = 10
@@ -103,7 +103,7 @@ def text_to_clipboards(text):  # pragma: no cover
         # "clipboard":
         xsel_proc = sp.Popen(['xsel', '-bi'], stdin=sp.PIPE)
         xsel_proc.communicate(text)
-    except OSError, e:
+    except OSError as e:
         print (e, "\nExecuting xsel failed, is it installed ?\n \
                please check your configuration file ... ")
 
@@ -118,7 +118,7 @@ def text_to_mcclipboard(text):  # pragma: no cover
     try:
         pbcopy_proc = sp.Popen(['pbcopy'], stdin=sp.PIPE)
         pbcopy_proc.communicate(text)
-    except OSError, e:
+    except OSError as e:
         print (e, "\nExecuting pbcoy failed...")
 
 
@@ -131,7 +131,7 @@ def open_url(link, macosx=False):  # pragma: no cover
         uopen = "open"
     try:
         sp.Popen([uopen, link], stdin=sp.PIPE)
-    except OSError, e:
+    except OSError as e:
         print ("Executing open_url failed with:\n", e)