Convert exception handling to Python3 syntax.

That works in Python >= 2.6.

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/dak/admin.py b/dak/admin.py
index fe369b51a753ca08add8ad22657e94f4644a4c9e..e109877faf0d5606fd5fb1ebe4049f973a821da5 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -137,9 +137,9 @@ def __architecture_add(d, args):
                 else:
                     warn("W: Cannot find suite %s" % su)
             s.commit()
-        except IntegrityError, e:
+        except IntegrityError as e:
             die("E: Integrity error adding architecture %s (it probably already exists)" % args[2])
-        except SQLAlchemyError, e:
+        except SQLAlchemyError as e:
             die("E: Error adding architecture %s (%s)" % (args[2], e))
     print "Architecture %s added" % (args[2])
 
@@ -154,9 +154,9 @@ def __architecture_rm(d, args):
                 die("E: Cannot find architecture %s" % args[2])
             s.delete(a)
             s.commit()
-        except IntegrityError, e:
+        except IntegrityError as e:
             die("E: Integrity error removing architecture %s (suite-arch entries probably still exist)" % args[2])
-        except SQLAlchemyError, e:
+        except SQLAlchemyError as e:
             die("E: Error removing architecture %s (%s)" % (args[2], e))
     print "Architecture %s removed" % args[2]
 
@@ -228,9 +228,9 @@ def __suite_add(d, args, addallarches=False):
             suite.srcformats = s.query(SrcFormat).all()
             s.add(suite)
             s.flush()
-        except IntegrityError, e:
+        except IntegrityError as e:
             die("E: Integrity error adding suite %s (it probably already exists)" % suite_name)
-        except SQLAlchemyError, e:
+        except SQLAlchemyError as e:
             die("E: Error adding suite %s (%s)" % (suite_name, e))
     print "Suite %s added" % (suite_name)
 
@@ -313,9 +313,9 @@ def __suite_architecture_add(d, args):
         try:
             suite.architectures.append(arch)
             s.commit()
-        except IntegrityError, e:
+        except IntegrityError as e:
             die("E: Can't add suite-architecture entry (%s, %s) - probably already exists" % (args[2].lower(), args[3].lower()))
-        except SQLAlchemyError, e:
+        except SQLAlchemyError as e:
             die("E: Can't add suite-architecture entry (%s, %s) - %s" % (args[2].lower(), args[3].lower(), e))
 
     print "Added suite-architecture entry for %s, %s" % (args[2].lower(), args[3].lower())
@@ -338,9 +338,9 @@ def __suite_architecture_rm(d, args):
                 die("E: architecture %s not found in suite %s" % (arch_string, suite_name))
             suite.architectures.remove(architecture)
             s.commit()
-        except IntegrityError, e:
+        except IntegrityError as e:
             die("E: Can't remove suite-architecture entry (%s, %s) - it's probably referenced" % (args[2].lower(), args[3].lower()))
-        except SQLAlchemyError, e:
+        except SQLAlchemyError as e:
             die("E: Can't remove suite-architecture entry (%s, %s) - %s" % (args[2].lower(), args[3].lower(), e))
 
     print "Removed suite-architecture entry for %s, %s" % (args[2].lower(), args[3].lower())

diff --git a/dak/check_archive.py b/dak/check_archive.py
index 1fb8560baaa628bb61abec14f56adce4094b50ac..89c3dcbd82d690141e01bc2c05d981d8f5f99b72 100755 (executable)
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -164,7 +164,7 @@ def check_dscs():
         except CantOpenError:
             utils.warn("missing dsc file (%s)" % f)
             count += 1
-        except Exception, e:
+        except Exception as e:
             utils.warn("miscellaneous error parsing dsc file (%s): %s" % (f, str(e)))
             count += 1
 

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 390c2551b85d02213b77bbde419bd6869d66a61c..6ade86c6a1c25e4e76a862d8b1a2f03e56072941 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -100,7 +100,7 @@ def init (cnf):
 
     try:
         os.chdir(incoming)
-    except OSError, e:
+    except OSError as e:
         utils.fubar("Cannot chdir to %s" % incoming)
 
 # Remove a file to the morgue

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 9713de3447f16825930ad029e018398dfb7b638c..806549e3895a001a5be8cb7dab5f195c380298d9 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -424,7 +424,7 @@ def main():
             max_delete = int(cnf["Clean-Suites::Options::Maximum"])
             if max_delete < 1:
                 utils.fubar("If given, Maximum must be at least 1")
-        except ValueError, e:
+        except ValueError as e:
             utils.fubar("If given, Maximum must be an integer")
     else:
         max_delete = None

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 6dd79b8fd258f113b3bcb90a9cea53984001f0f5..57e43da6ac0b77418c8b4745d4c900ef9c4c8728 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -396,7 +396,7 @@ def main ():
 
     try:
         file_list = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv);
-    except SystemError, e:
+    except SystemError as e:
         print "%s\n" % e
         usage(1)
     Options = cnf.SubTree("Control-Suite::Options")

diff --git a/dak/dakdb/update1.py b/dak/dakdb/update1.py
index 0c83377387431f69dd4c615a96f4aef9cccf0a7d..ede12e56c949315ccd3790d7d212cae455569be5 100755 (executable)
--- a/dak/dakdb/update1.py
+++ b/dak/dakdb/update1.py
@@ -64,6 +64,6 @@ def do_update(self):
         print "Pausing for five seconds ..."
         time.sleep (5)
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy DM table updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update10.py b/dak/dakdb/update10.py
index 5cd4f30dc50899aa78933bf8d8602e6d975c350a..52a5d0be164a829e350b19b4918dba59a977f963 100755 (executable)
--- a/dak/dakdb/update10.py
+++ b/dak/dakdb/update10.py
@@ -51,6 +51,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '10' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update11.py b/dak/dakdb/update11.py
index a4797cb4bdf557e1634304403a9d6ffffd855e8d..6569f8ebb144ab3fd7b0e47118ec706503600b89 100755 (executable)
--- a/dak/dakdb/update11.py
+++ b/dak/dakdb/update11.py
@@ -58,6 +58,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '11' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new comments update, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update12.py b/dak/dakdb/update12.py
index 890f51cb66c75a767693cec4762450b5ae394d55..1141c5992dc7aae000d6cc728999e717b477be57 100755 (executable)
--- a/dak/dakdb/update12.py
+++ b/dak/dakdb/update12.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '12' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new update 12, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update13.py b/dak/dakdb/update13.py
index d5dbedced401efccdd3e09b0e5e2222feaa2039d..ddb79780117d9adbd850e975da2ce4e4fd269b6f 100755 (executable)
--- a/dak/dakdb/update13.py
+++ b/dak/dakdb/update13.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '13' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new update 13, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update14.py b/dak/dakdb/update14.py
index 4f1b1dac893c8dc247e19af533e98772e4c34b3a..44b061b1e76bd9fd3f2a5d7af616dcd4e558970d 100755 (executable)
--- a/dak/dakdb/update14.py
+++ b/dak/dakdb/update14.py
@@ -48,6 +48,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '14' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new update 14, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update15.py b/dak/dakdb/update15.py
index 535f9e67cc2bf5890e2213726d337bc9ada74119..3074ff09238c6630fcd6a2efb730df68626f0e18 100755 (executable)
--- a/dak/dakdb/update15.py
+++ b/dak/dakdb/update15.py
@@ -79,6 +79,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '15' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply source format update 15, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update16.py b/dak/dakdb/update16.py
index eca9b48ea03c460def0f192d05ae6d4589b7cef6..d64c2220b28617fd2231c5c1ab2ceafd32a0e3f4 100755 (executable)
--- a/dak/dakdb/update16.py
+++ b/dak/dakdb/update16.py
@@ -173,6 +173,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '16' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply ACLs update (16), rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update17.py b/dak/dakdb/update17.py
index beca9425020e6b3df6004eccdf6dea1299a54541..8fc3bd058f0cec4c43fb31e31d4603f1f7b46f30 100755 (executable)
--- a/dak/dakdb/update17.py
+++ b/dak/dakdb/update17.py
@@ -58,7 +58,7 @@ def do_update(self):
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new update 17, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index ce0086f67e88af5b3a3a80e3ee6bb0da10f50145..eb8efa4a4cbc943401e1fad9afd2b3bc4edb3170 100755 (executable)
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -144,13 +144,13 @@ def do_update(self):
                         changes.changes = parse_changes(changesfile, signing_rules=-1)
                         changes.changes["fingerprint"] = check_signature(changesfile)
                         changes.add_known_changes(directory)
-                    except InvalidDscError, line:
+                    except InvalidDscError as line:
                         warn("syntax error in .dsc file '%s', line %s." % (f, line))
                         failure += 1
                     except ChangesUnicodeError:
                         warn("found invalid changes file, not properly utf-8 encoded")
                         failure += 1
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply knownchanges update 18, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update19.py b/dak/dakdb/update19.py
index 49a4dbc71f24b5234e63e15fdabaf65b4b9826d5..5186ded626654768cbe830e89792eea63033ebe8 100755 (executable)
--- a/dak/dakdb/update19.py
+++ b/dak/dakdb/update19.py
@@ -102,6 +102,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '19' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply debversion update 19, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
index 2e3cb446b55f1cedb985628f17524caa1520964b..9ad0da5d573cacc5b4e166a20d109e203c87b8dc 100755 (executable)
--- a/dak/dakdb/update2.py
+++ b/dak/dakdb/update2.py
@@ -396,6 +396,6 @@ $$
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update20.py b/dak/dakdb/update20.py
index f4e34cb96b56428791918a43642d4fa8f932e071..70572fcb0917547f92171d57fbacdde2b19538c0 100755 (executable)
--- a/dak/dakdb/update20.py
+++ b/dak/dakdb/update20.py
@@ -95,6 +95,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '20' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply debversion update 20, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update21.py b/dak/dakdb/update21.py
index 8e36883f9eb7b4cdf9bfc80a322d9044fec64346..2555e4c74715bbf73d9a000f8378172e04a6ecac 100755 (executable)
--- a/dak/dakdb/update21.py
+++ b/dak/dakdb/update21.py
@@ -74,7 +74,7 @@ def do_update(self):
                 f = c.fetchone()
                 c.execute("""INSERT INTO queue_files (queueid, lastused, filename, fileid) VALUES
                                                      (%s, now(), %s, %s)""", (queue, filename[filename.rindex('/')+1:], f[0]))
-            except OSError, e:
+            except OSError as e:
                 print "Can't find file %s (%s)" % (filename, e)
 
         print "Dropping old queue_build table"
@@ -124,6 +124,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '21' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply queue_build 21, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update22.py b/dak/dakdb/update22.py
index dbd7ced6023c1d3bf77b7c225ca1a4e4361d8211..81f20037ee0f674dc91ee37d155a9789ecf37a7b 100755 (executable)
--- a/dak/dakdb/update22.py
+++ b/dak/dakdb/update22.py
@@ -235,6 +235,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '22' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply queue_build 21, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update23.py b/dak/dakdb/update23.py
index 48abf0162df781d6caa47518d5dc6bfa9ae749f2..922322b35fe8a1b21f7b82b553d8282a34a399d8 100755 (executable)
--- a/dak/dakdb/update23.py
+++ b/dak/dakdb/update23.py
@@ -58,7 +58,7 @@ CREATE VIEW srcfiles_suite_component AS
         c.execute("UPDATE config SET value = '23' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update24.py b/dak/dakdb/update24.py
index 4e8c505d5c62c01afd878ff1cf6e193ad41e8cb9..83047668c633a451158dee4a6915d7ebee9bcdcb 100755 (executable)
--- a/dak/dakdb/update24.py
+++ b/dak/dakdb/update24.py
@@ -56,7 +56,7 @@ def do_update(self):
         c.execute("UPDATE config SET value = '24' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update25.py b/dak/dakdb/update25.py
index b2813d9118f820438676a54f9b7bf78aeb718b18..3fc8c558f76947a3917a45b574a4ec3eb7297b9a 100755 (executable)
--- a/dak/dakdb/update25.py
+++ b/dak/dakdb/update25.py
@@ -183,7 +183,7 @@ CREATE VIEW obsolete_all_associations AS
         c.execute("UPDATE config SET value = '25' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update26.py b/dak/dakdb/update26.py
index 1b9a7fc14b11089addf6f5171b7dcde140ddaf38..4329bc3aed7c3c29aa674f7a64e385a8b56ad601 100755 (executable)
--- a/dak/dakdb/update26.py
+++ b/dak/dakdb/update26.py
@@ -61,7 +61,7 @@ def do_update(self):
         c.execute("UPDATE config SET value = '26' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
             self.db.rollback()
             raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update27.py b/dak/dakdb/update27.py
index b06932b52ed1e20e89c4a7224627ed9d85d7d6dc..7a492a3f2f399e5448747fe4e19b74a3f03fa362 100755 (executable)
--- a/dak/dakdb/update27.py
+++ b/dak/dakdb/update27.py
@@ -74,7 +74,7 @@ CREATE OR REPLACE VIEW bin_associations_binaries AS
         c.execute("UPDATE config SET value = '27' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.InternalError, msg:
+    except psycopg2.InternalError as msg:
         self.db.rollback()
         raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update28.py b/dak/dakdb/update28.py
index 79b0e8db8250fb3e657edcf9daf9ba4fdb1706a5..c899831ca527784008d29a6ddaf7051e54a9608c 100755 (executable)
--- a/dak/dakdb/update28.py
+++ b/dak/dakdb/update28.py
@@ -265,7 +265,7 @@ $$ LANGUAGE plpythonu VOLATILE;""")
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new update 28, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update29.py b/dak/dakdb/update29.py
index d25c1011a56fbba16449f940f7972798b17f74c2..66600b6312915d4ea6816205f37dcc06de478e22 100644 (file)
--- a/dak/dakdb/update29.py
+++ b/dak/dakdb/update29.py
@@ -47,6 +47,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '29' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
index 5a5562fbedfe2659c5c2990f7ba125b3a25ac00c..1eab89f66e45e2147403268b0984d8e60bce5670 100755 (executable)
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -49,6 +49,6 @@ def do_update(self):
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy versioncmp removal, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update30.py b/dak/dakdb/update30.py
index 2d962749219a8ba513bbccb9517f622960928b5e..fe591614dd51af6034e8962c89ce6bbe6d1f046f 100644 (file)
--- a/dak/dakdb/update30.py
+++ b/dak/dakdb/update30.py
@@ -95,6 +95,6 @@ $$ LANGUAGE plpythonu VOLATILE SECURITY DEFINER;
         c.execute("UPDATE config SET value = '30' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update31.py b/dak/dakdb/update31.py
index 8ebfe3424732447ee5c00331347f07f48d75b55e..dc4245cce87a156a2d4b5e1bc5f49f27a2b04fdb 100644 (file)
--- a/dak/dakdb/update31.py
+++ b/dak/dakdb/update31.py
@@ -94,7 +94,7 @@ $$ LANGUAGE plpythonu VOLATILE SECURITY DEFINER;
         c.execute("UPDATE config SET value = '31' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply process-new update 31, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update32.py b/dak/dakdb/update32.py
index 98eaa4e6973fd063aacfb4085a89cdc7f5902063..c0882fb1ccfb42c5f62c23bdd938baef3902094e 100755 (executable)
--- a/dak/dakdb/update32.py
+++ b/dak/dakdb/update32.py
@@ -44,7 +44,7 @@ def do_update(self):
         c.execute("UPDATE config SET value = '32' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply build_queue update 32, rollback issued. Error message : %s" % (str(msg))
 

diff --git a/dak/dakdb/update33.py b/dak/dakdb/update33.py
index 9624ba627b93daf42d0ec3b99274f1dfe3635e97..d3867af32471151dfc876c9d1f687d278a16c577 100644 (file)
--- a/dak/dakdb/update33.py
+++ b/dak/dakdb/update33.py
@@ -50,6 +50,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '33' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply build_queue update 33, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update34.py b/dak/dakdb/update34.py
index ea0535dba185543bb34b557f52f0e84cce4c9e5f..35351c249c868d24bf2a03622717a29de60c31c0 100644 (file)
--- a/dak/dakdb/update34.py
+++ b/dak/dakdb/update34.py
@@ -43,6 +43,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '34' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply build_queue update 34, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update35.py b/dak/dakdb/update35.py
index 335d70e5f67e3fc48f02fe71afeef1c6c9cf5f96..cc289e41cc08234a422e3969189c4d0b40262d7c 100644 (file)
--- a/dak/dakdb/update35.py
+++ b/dak/dakdb/update35.py
@@ -45,6 +45,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '35' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply build_queue update 35, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update36.py b/dak/dakdb/update36.py
index d5810f6815069cc6376a003474d2b8e1debea52a..c672d8d7b6ffd7d1d6298f9e859380be877b3668 100644 (file)
--- a/dak/dakdb/update36.py
+++ b/dak/dakdb/update36.py
@@ -43,6 +43,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '36' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply build_queue update 36, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update37.py b/dak/dakdb/update37.py
index 5a6714bbf0dd4138ff6871b8d7250022a40cb16f..136f464976d45c737a5fb2b119446fcdb9164921 100755 (executable)
--- a/dak/dakdb/update37.py
+++ b/dak/dakdb/update37.py
@@ -52,6 +52,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '37' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply table-colum update 37, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update38.py b/dak/dakdb/update38.py
index 583aa3ade53edb297011a9e1465250cbe43f66bd..28a411baf975ddf5290f4cfe178192a0748add81 100755 (executable)
--- a/dak/dakdb/update38.py
+++ b/dak/dakdb/update38.py
@@ -51,6 +51,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '38' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply table-column update 38, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update39.py b/dak/dakdb/update39.py
index 8086b515f689c953344a055709762c2b306561c7..c97b4f062505635c99e7b9a6575e32edea672bd9 100644 (file)
--- a/dak/dakdb/update39.py
+++ b/dak/dakdb/update39.py
@@ -42,6 +42,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '39' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply table-column update 39, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update4.py b/dak/dakdb/update4.py
index 477944c830408548367e13710495bd26084bb905..169653fa4397caa7f4fd9e89b67b873553c419f7 100755 (executable)
--- a/dak/dakdb/update4.py
+++ b/dak/dakdb/update4.py
@@ -64,6 +64,6 @@ def do_update(self):
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply sanity to suite_architecture table, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update40.py b/dak/dakdb/update40.py
index 062b0dd842adfac966a6805a1bb7e14c6bb02839..a13ec10bf227e5614db5c6bc55ca38841ecc8f5e 100755 (executable)
--- a/dak/dakdb/update40.py
+++ b/dak/dakdb/update40.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '40' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 40, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update41.py b/dak/dakdb/update41.py
index 813a3b709e17a83488245ef748a70d7e44f6ce52..5243cd6704d4c1b004c5c7d4d92cedb9d8196aca 100755 (executable)
--- a/dak/dakdb/update41.py
+++ b/dak/dakdb/update41.py
@@ -61,6 +61,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '41' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 41, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update42.py b/dak/dakdb/update42.py
index 48bc9d61af4ccc8b9c6f83b4cbe9334dc668ee7e..bfd4b1fc5d933721c89489a4de7792181c87e37e 100755 (executable)
--- a/dak/dakdb/update42.py
+++ b/dak/dakdb/update42.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '42' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply update 42, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update43.py b/dak/dakdb/update43.py
index 071541051a381dec7670ff209acfb14d95c593f8..38bc29a17509d22de2410cd697f16061d93906e9 100755 (executable)
--- a/dak/dakdb/update43.py
+++ b/dak/dakdb/update43.py
@@ -46,6 +46,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '43' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply update 43, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update44.py b/dak/dakdb/update44.py
index 465f2fce6a86a1ef65475052fad7937615d8b8ca..1b4a5714e1194b353ee25adb75ef614d6121f3ff 100755 (executable)
--- a/dak/dakdb/update44.py
+++ b/dak/dakdb/update44.py
@@ -47,6 +47,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '44' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 44, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update45.py b/dak/dakdb/update45.py
index 32ed04f086820de19dc630b4e0f97ca5a9e0b943..8de1e67059ecfe9845ac156298103c75c0b31e35 100755 (executable)
--- a/dak/dakdb/update45.py
+++ b/dak/dakdb/update45.py
@@ -48,6 +48,6 @@ CREATE TABLE extra_src_references (
         c.execute("UPDATE config SET value = '45' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply update 45, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update46.py b/dak/dakdb/update46.py
index d1b2d3ac43ff8542e4af0bada52bf064d712f7c8..55a382fac1e68292eeba0e76a8a2de4e875621b5 100755 (executable)
--- a/dak/dakdb/update46.py
+++ b/dak/dakdb/update46.py
@@ -72,6 +72,6 @@ CREATE TABLE source_metadata (
         c.execute("UPDATE config SET value = '46' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply update 46, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update47.py b/dak/dakdb/update47.py
index 81d9cd788f44b8eb3d5a1f7399a3fb1b3b867a35..c93ffb84fee91d25a5dc3163823894a6d8e48849 100755 (executable)
--- a/dak/dakdb/update47.py
+++ b/dak/dakdb/update47.py
@@ -47,6 +47,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '47' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 47, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update48.py b/dak/dakdb/update48.py
index 67ea8c5b1ed795e011884005497a99043de4bf4e..3bc0f8936e3f8013ce0410a63b8ede3460434ead 100755 (executable)
--- a/dak/dakdb/update48.py
+++ b/dak/dakdb/update48.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '48' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 48, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update49.py b/dak/dakdb/update49.py
index 5ff1545ca3ca4b2c9fd885d7d9310f3d7408952a..44e1f9fca67e677d05f48e3f98d28fb0c4daa1de 100755 (executable)
--- a/dak/dakdb/update49.py
+++ b/dak/dakdb/update49.py
@@ -56,6 +56,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '49' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 49, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update5.py b/dak/dakdb/update5.py
index 49e338916b92f1a0b4ba9d16912d0059829bde12..7c892a7a0e1fc51acc4bcc7a7b21a04c4650245a 100755 (executable)
--- a/dak/dakdb/update5.py
+++ b/dak/dakdb/update5.py
@@ -46,6 +46,6 @@ def do_update(self):
 
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to recreate bin_assoc_by_arch view, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update50.py b/dak/dakdb/update50.py
index ae7ea4d0337158bba2205f940ea4892da012e20e..568c33bc0dd0bb882412990526a658fc819fb284 100755 (executable)
--- a/dak/dakdb/update50.py
+++ b/dak/dakdb/update50.py
@@ -42,6 +42,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '50' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 50, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update51.py b/dak/dakdb/update51.py
index 2aea858ec734516ec468822806486f51fb8eaf89..02a8fc233b0d057b87a94f4d50388e7e1cd3205f 100755 (executable)
--- a/dak/dakdb/update51.py
+++ b/dak/dakdb/update51.py
@@ -53,6 +53,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '51' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 51, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update52.py b/dak/dakdb/update52.py
index d38ee26f91267763085b1be91f5e83214974fa84..938b3ceaf773b2aab301bf00f23493ee16116b75 100755 (executable)
--- a/dak/dakdb/update52.py
+++ b/dak/dakdb/update52.py
@@ -61,6 +61,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '52' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 52, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update53.py b/dak/dakdb/update53.py
index 36a076f6e347e9edca11a4a76b4fc2adc7c185ce..a2c8a0a3348362b51ced4ff3c25bc320ed76a37f 100755 (executable)
--- a/dak/dakdb/update53.py
+++ b/dak/dakdb/update53.py
@@ -50,6 +50,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '53' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 53, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update54.py b/dak/dakdb/update54.py
index e7676ef0b179fc0cd51d661479d6bdd51b228f48..3922f69bdc726391e60e2b168e14ddde904165e5 100755 (executable)
--- a/dak/dakdb/update54.py
+++ b/dak/dakdb/update54.py
@@ -47,6 +47,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '54' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 54, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update55.py b/dak/dakdb/update55.py
index 3328e85c251fa38c370889937ea48575a4eea27a..8dfc4a58f4f2d97712a3088032ef46f5eea125cc 100755 (executable)
--- a/dak/dakdb/update55.py
+++ b/dak/dakdb/update55.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '55' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 55, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update56.py b/dak/dakdb/update56.py
index f04ebc87d6f5afcef2e50f2dda4beb633059ab2a..58ecc9f211d9cb41fc8920dcba26e2fe2388cd4b 100755 (executable)
--- a/dak/dakdb/update56.py
+++ b/dak/dakdb/update56.py
@@ -85,6 +85,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '56' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 56, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update57.py b/dak/dakdb/update57.py
index 45a37dc683dcda6eb4e62d1cb2231deb7ad06539..1b6ddc8a143cb11afd9562694a3f34196d2be9e8 100755 (executable)
--- a/dak/dakdb/update57.py
+++ b/dak/dakdb/update57.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '57' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 57, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update58.py b/dak/dakdb/update58.py
index 8680fc25add77cc7b6954b3d513f70c6a7f504e1..802a5167689e2259bffda158ec6eebbfbac70098 100755 (executable)
--- a/dak/dakdb/update58.py
+++ b/dak/dakdb/update58.py
@@ -85,6 +85,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '58' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 58, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update59.py b/dak/dakdb/update59.py
index 6417a370aa037a9cdb68357a793e3499c2e1fd15..ec3f07f8acb811d4c23d9a85b7e71963cfc2a37f 100755 (executable)
--- a/dak/dakdb/update59.py
+++ b/dak/dakdb/update59.py
@@ -51,6 +51,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '59' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 59, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update6.py b/dak/dakdb/update6.py
index 13d609669f03d3b0905827cd7174a06e0d836300..78a04f5fc5321a869e91017603a627a8f56101d9 100755 (executable)
--- a/dak/dakdb/update6.py
+++ b/dak/dakdb/update6.py
@@ -87,6 +87,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '6' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update60.py b/dak/dakdb/update60.py
index 4cf6ee8f2a8970977ad7c19f1e54829c73bc1e7a..dc61eaca4f1fbbb5a0a74127f62cb1db913964af 100755 (executable)
--- a/dak/dakdb/update60.py
+++ b/dak/dakdb/update60.py
@@ -51,6 +51,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '60' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 60, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update61.py b/dak/dakdb/update61.py
index 570bb6bdd31263f3da5ec347d75a6446406b9031..d8b47ec84a3f6f332b03549e154145fdac329540 100755 (executable)
--- a/dak/dakdb/update61.py
+++ b/dak/dakdb/update61.py
@@ -50,6 +50,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '61' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 61, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update62.py b/dak/dakdb/update62.py
index f320bbf0ba4d75e9adc3d695a7666dc62aaf6e57..597a19cbbfd77a50c1346899fd994d8d9b07d7ad 100755 (executable)
--- a/dak/dakdb/update62.py
+++ b/dak/dakdb/update62.py
@@ -42,6 +42,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '62' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 62, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update63.py b/dak/dakdb/update63.py
index 9b1187c6e19d9f814494e3074923ebf170425da0..9d2cce68de799b4930571230176599b4689ed4f0 100755 (executable)
--- a/dak/dakdb/update63.py
+++ b/dak/dakdb/update63.py
@@ -54,6 +54,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '63' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 63, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update64.py b/dak/dakdb/update64.py
index bce9e94ae6258aba900dbf6ff0d33b403230d3d8..b34a8787df6dcdad525651cf0795788bb793d943 100755 (executable)
--- a/dak/dakdb/update64.py
+++ b/dak/dakdb/update64.py
@@ -44,6 +44,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '64' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 64, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update65.py b/dak/dakdb/update65.py
index 8dd83a1b24e51afcb68e9ad00b6dc8fd581df3a2..76bfe61a6891d87e1cee5d484f97816f588ab844 100755 (executable)
--- a/dak/dakdb/update65.py
+++ b/dak/dakdb/update65.py
@@ -46,6 +46,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '65' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 65, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update66.py b/dak/dakdb/update66.py
index af61c04a75a2c843c00b765fea206608fc642e37..2a59c7134760cb206ea4f022729a31aa9d3e1d01 100755 (executable)
--- a/dak/dakdb/update66.py
+++ b/dak/dakdb/update66.py
@@ -55,6 +55,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '66' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, 'Unable to apply sick update 66, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/dakdb/update7.py b/dak/dakdb/update7.py
index 6f91eb378d2dc1dd6c06fdcab87757508131a05c..7e5c2091652fd881ef406a0404ba079729aa8138 100755 (executable)
--- a/dak/dakdb/update7.py
+++ b/dak/dakdb/update7.py
@@ -116,6 +116,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '7' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to appy suite config updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update8.py b/dak/dakdb/update8.py
index 2f92c4d833d7008d1495e01ae43110d6b46ce999..1c86c866bbb7df137f34c8004800e8994bcf0f05 100755 (executable)
--- a/dak/dakdb/update8.py
+++ b/dak/dakdb/update8.py
@@ -99,6 +99,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '8' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/dakdb/update9.py b/dak/dakdb/update9.py
index 2ca3c51eee6f42f4dfcbb820174c615c7a8adbc0..20af71fd23f9e151b3b935f44bcb855328a00f43 100755 (executable)
--- a/dak/dakdb/update9.py
+++ b/dak/dakdb/update9.py
@@ -57,6 +57,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '9' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg))

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 8e2ce20b987135538e4a0d76cab2be7a8df72665..edb9384b6c5be92b0e20ff23544ba1a031922ef4 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -507,7 +507,7 @@ def get_readme_source (dsc_filename):
 
     try:
         shutil.rmtree(tempdir)
-    except OSError, e:
+    except OSError as e:
         if errno.errorcode[e.errno] != 'EACCES':
             res += "%s: couldn't remove tmp dir %s for source tree." % (dsc_filename, tempdir)
 
@@ -634,7 +634,7 @@ def main ():
                     # Reset stdout here so future less invocations aren't FUBAR
                     less_fd.close()
                     sys.stdout = stdout_fd
-        except IOError, e:
+        except IOError as e:
             if errno.errorcode[e.errno] == 'EPIPE':
                 utils.warn("[examine-package] Caught EPIPE; skipping.")
                 pass

diff --git a/dak/graph.py b/dak/graph.py
index aa28aa6efd98633818f1b5cab683d4e42c3af645..8d94b6b2c512a40b5760a279e04fc81b450677c8 100755 (executable)
--- a/dak/graph.py
+++ b/dak/graph.py
@@ -105,7 +105,7 @@ GPRINT:avgd%i:avg\\: %%.0lf\\j
     rrd_args += extra_args
     try:
         ret = rrdtool.graph(*rrd_args)
-    except rrdtool.error, e:
+    except rrdtool.error as e:
         print('warning: graph: rrdtool error, skipping %s-%s.png: %s' % (name, graph, e))
 
 def graph_normal(rrd_dir, image_dir, name, extra_args, graph, title, start, year_lines=False):
@@ -157,7 +157,7 @@ GPRINT:avgds0:avg\\: %%.0lf\\j
     rrd_args += extra_args
     try:
         ret = rrdtool.graph(*rrd_args)
-    except rrdtool.error, e:
+    except rrdtool.error as e:
         print('warning: graph: rrdtool error, skipping %s-%s.png: %s' % (name, graph, e))
 
 ################################################################################

diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py
index 125dbb8c576e9b531af95ede45bcb12157ce58f9..7b182d6f199123908f02b5406ea9ae580ea14c3c 100755 (executable)
--- a/dak/import_known_changes.py
+++ b/dak/import_known_changes.py
@@ -269,7 +269,7 @@ class ImportThread(threading.Thread):
                 changes.add_known_changes(to_import.dirpath, session=self.session)
                 self.session.commit()
 
-            except InvalidDscError, line:
+            except InvalidDscError as line:
                 warn("syntax error in .dsc file '%s', line %s." % (f, line))
 
             except ChangesUnicodeError:

diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py
index b959e37fa64e9f4b2020d7d6afe2226193b844ec..a9dacd349a99966f19af0d88faaccc1169abca50 100755 (executable)
--- a/dak/import_users_from_passwd.py
+++ b/dak/import_users_from_passwd.py
@@ -118,7 +118,7 @@ def main ():
                     try:
                         q = session.execute('CREATE USER "%s"' % (uname))
                         session.commit()
-                    except Exception, e:
+                    except Exception as e:
                         utils.warn("Could not create user %s (%s)" % (uname, str(e)))
                         session.rollback()
                 else:

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index ac5581d02be8ae43a3de98d4145a1ef1a49cb7f3..ad6dbab1a80173857072918b0da7fd03fe6366a5 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -225,7 +225,7 @@ def export_files(session, pool, clpool):
                         os.link(version, suite)
                         stats['created'] += 1
             unpacked.cleanup()
-        except Exception, e:
+        except Exception as e:
             print 'make-changelog: unable to unpack %s\n%s' % (p, e)
             stats['errors'] += 1
 

diff --git a/dak/process_new.py b/dak/process_new.py
index 1a25369789518406cfdd0fd293b4e73c74e03e02..92dde2d3637d4c3675fbc88682fbc40d6465a923 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -351,7 +351,7 @@ def check_pkg (upload):
                 elif ftype == "dsc":
                     print examine_package.check_dsc(changes['distribution'], f)
         print examine_package.output_package_relations()
-    except IOError, e:
+    except IOError as e:
         if e.errno == errno.EPIPE:
             utils.warn("[examine_package] Caught EPIPE; skipping.")
         else:
@@ -616,7 +616,7 @@ def check_daily_lock():
 
         os.open(lockfile,
                 os.O_RDONLY | os.O_CREAT | os.O_EXCL)
-    except OSError, e:
+    except OSError as e:
         if e.errno == errno.EEXIST or e.errno == errno.EACCES:
             raise CantGetLockError
 
@@ -638,7 +638,7 @@ def lock_package(package):
 
     try:
         fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDONLY)
-    except OSError, e:
+    except OSError as e:
         if e.errno == errno.EEXIST or e.errno == errno.EACCES:
             user = pwd.getpwuid(os.stat(path)[stat.ST_UID])[4].split(',')[0].replace('.', '')
             raise AlreadyLockedError, user
@@ -720,7 +720,7 @@ def do_pkg(changes_full_path, session):
                         print "Hello? Operator! Give me the number for 911!"
                         print "Dinstall in the locked area, cant process packages, come back later"
 
-    except AlreadyLockedError, e:
+    except AlreadyLockedError as e:
         print "Seems to be locked by %s already, skipping..." % (e)
 
 def show_new_comments(changes_files, session):
@@ -791,7 +791,7 @@ def main():
     if not Options["No-Action"]:
         try:
             Logger = daklog.Logger("process-new")
-        except CantOpenError, e:
+        except CantOpenError as e:
             Options["Trainee"] = "True"
 
     Sections = Section_Completer(session)

diff --git a/dak/process_policy.py b/dak/process_policy.py
index 94e274687bcd0902f652c91db8756c298f94587d..3f237f626b506b5cb929c4fc4ede505530cc748f 100755 (executable)
--- a/dak/process_policy.py
+++ b/dak/process_policy.py
@@ -142,7 +142,7 @@ def main():
     if not Options["No-Action"]:
         try:
             Logger = daklog.Logger("process-policy")
-        except CantOpenError, e:
+        except CantOpenError as e:
             Logger = None
 
     # Find policy queue

diff --git a/dak/process_upload.py b/dak/process_upload.py
index bf74baa65be064e356abaa8459b39a6688c85ad9..4d9f3b00b768071363bd9ac74c72cefe19de7e74 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -229,7 +229,7 @@ def action(u, session):
 
     try:
         chg = session.query(DBChange).filter_by(changesname=os.path.basename(u.pkg.changes_file)).one()
-    except NoResultFound, e:
+    except NoResultFound as e:
         chg = None
 
     if len(u.rejects) > 0:
@@ -458,7 +458,7 @@ def main():
         lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT)
         try:
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        except IOError, e:
+        except IOError as e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-upload' is already running.")
             else:

diff --git a/dak/queue_report.py b/dak/queue_report.py
index ec7b3a7d2fe55abbf089dcf65f0910f97ef3e1d5..5fd9288a8c6da8711b48e1eff274f213e169c955 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -312,7 +312,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
         try:
             (login, domain) = sponsor.split("@", 1)
             print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a></span>@debian.org<br/>" % (utils.html_escape(login), utils.html_escape(login))
-        except Exception, e:
+        except Exception as e:
             pass
 
     print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
@@ -355,7 +355,7 @@ RRA:MAX:0.5:288:795
         try:
             rc = rrdtool.create(*create)
             ru = rrdtool.update(*update)
-        except rrdtool.error, e:
+        except rrdtool.error as e:
             print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e))
     except NameError:
         pass
@@ -372,7 +372,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
             u.load_changes(filename)
             cache[filename] = copy(u.pkg.changes)
             cache[filename]["filename"] = filename
-        except Exception, e:
+        except Exception as e:
             print "WARNING: Exception %s" % e
             continue
     # Divide the .changes into per-source groups
@@ -438,7 +438,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                 session = DBConn().session()
                 dbc = session.query(DBChange).filter_by(changesname=changesbase).one()
                 session.close()
-            except Exception, e:
+            except Exception as e:
                 print "Can't find changes file in NEW for %s (%s)" % (changesbase, e)
                 dbc = None
 
@@ -447,7 +447,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                     (maintainer["maintainer822"], maintainer["maintainer2047"],
                     maintainer["maintainername"], maintainer["maintaineremail"]) = \
                     fix_maintainer (j["maintainer"])
-                except ParseMaintError, msg:
+                except ParseMaintError as msg:
                     print "Problems while parsing maintainer address\n"
                     maintainer["maintainername"] = "Unknown"
                     maintainer["maintaineremail"] = "Unknown"
@@ -457,7 +457,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                     (changeby["changedby822"], changeby["changedby2047"],
                      changeby["changedbyname"], changeby["changedbyemail"]) = \
                      fix_maintainer (j["changed-by"])
-                except ParseMaintError, msg:
+                except ParseMaintError as msg:
                     (changeby["changedby822"], changeby["changedby2047"],
                      changeby["changedbyname"], changeby["changedbyemail"]) = \
                      ("", "", "", "")

diff --git a/dak/rm.py b/dak/rm.py
index d0b46f62234b2033770d4b18fdcd98fd9a694dd3..3edeac3dc35c3ccdd4a9a736f135426b859461ba 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -177,7 +177,7 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
             parsed_dep = []
             try:
                 parsed_dep += apt_pkg.ParseDepends(deps[package])
-            except ValueError, e:
+            except ValueError as e:
                 print "Error for package %s: %s" % (package, e)
             for dep in parsed_dep:
                 # Check for partial breakage.  If a package has a ORed
@@ -236,7 +236,7 @@ def reverse_depends_check(removals, suite, arches=None, session=None):
             build_dep = re_build_dep_arch.sub("", build_dep)
             try:
                 parsed_dep += apt_pkg.ParseDepends(build_dep)
-            except ValueError, e:
+            except ValueError as e:
                 print "Error for source %s: %s" % (source, e)
         for dep in parsed_dep:
             unsat = 0

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 4dd603e4bc53f7c8ccfaf750ed0c13f843d84912..2b6cd71e60a98efcf265e62231b8817dfa2e914b 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -173,7 +173,7 @@ RRA:MAX:0.5:288:795
         try:
             rc = rrdtool.create(*create)
             ru = rrdtool.update(*update)
-        except rrdtool.error, e:
+        except rrdtool.error as e:
             print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e))
     except NameError:
         pass

diff --git a/dak/transitions.py b/dak/transitions.py
index e2461ad2ef56b82ee0cb19bc7fdb7e14f106dcce..9d21a562ce68db8d548dc09ad0e0fc7fb71838f0 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -135,7 +135,7 @@ def load_transitions(trans_file):
     failure = False
     try:
         trans = yaml.load(sourcecontent)
-    except yaml.YAMLError, exc:
+    except yaml.YAMLError as exc:
         # Someone fucked it up
         print "ERROR: %s" % (exc)
         return None
@@ -225,7 +225,7 @@ def lock_file(f):
         try:
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
             return lock_fd
-        except OSError, e:
+        except OSError as e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EEXIST':
                 print "Unable to get lock for %s (try %d of 10)" % \
                         (file, retry+1)
@@ -589,7 +589,7 @@ def main():
     if Options["import"]:
         try:
             write_transitions_from_file(Options["import"])
-        except TransitionsError, m:
+        except TransitionsError as m:
             print m
             sys.exit(2)
         sys.exit(0)

diff --git a/dak/update_db.py b/dak/update_db.py
index 0f1e7a379f8423a3d33ad3416f2c253dcdd11b6a..b757912177e0dfa8c0baf2c9b5f4ddc61c07f557 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -134,7 +134,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
             self.db = psycopg2.connect(connect_str)
 
-        except Exception, e:
+        except Exception as e:
             print "FATAL: Failed connect to database (%s)" % str(e)
             sys.exit(1)
 
@@ -171,7 +171,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
                 message = "updated database schema from %d to %d" % (database_revision, i+1)
                 print message
                 logger.log([message])
-            except DBUpdateError, e:
+            except DBUpdateError as e:
                 # Seems the update did not work.
                 print "Was unable to update database schema from %d to %d." % (database_revision, i+1)
                 print "The error message received was %s" % (e)
@@ -205,7 +205,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
                 fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
             else:
                 utils.warn("Lock directory doesn't exist yet - not locking")
-        except IOError, e:
+        except IOError as e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")
 

diff --git a/daklib/contents.py b/daklib/contents.py
index bebab6dd1c9c2a252a62592cda1c97e84738a0e2..6db19a711255cfb250a40927b9c28560cb471428 100755 (executable)
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -494,6 +494,6 @@ def source_scan_helper(source_id):
     try:
         scanner = SourceContentsScanner(source_id)
         scanner.scan()
-    except Exception, e:
+    except Exception as e:
         print e
 

diff --git a/daklib/dakmultiprocessing.py b/daklib/dakmultiprocessing.py
index 86fa74d5208a860a718edfa479568fcd0269608a..b709ecf558850f6f4ec2cf405e9e10b6a0c130cd 100644 (file)
--- a/daklib/dakmultiprocessing.py
+++ b/daklib/dakmultiprocessing.py
@@ -66,9 +66,9 @@ def _func_wrapper(func, *args, **kwds):
     #  messages is a string used for logging
     try:
         return (func(*args, **kwds))
-    except SignalException, e:
+    except SignalException as e:
         return (PROC_STATUS_SIGNALRAISED, e.signum)
-    except Exception, e:
+    except Exception as e:
         return (PROC_STATUS_EXCEPTION, str(e))
     finally:
         # Make sure connections are closed. We might die otherwise.

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 637301871a6bf4495036d8a004d7d3d8086f7fa2..4e01b610ce1789acffd9272d8559c34f86542795 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -818,7 +818,7 @@ class BuildQueue(object):
                     Logger.log(["I: Removing %s from the queue" % o.fullpath])
                     os.unlink(o.fullpath)
                     killdb = True
-            except OSError, e:
+            except OSError as e:
                 # If it wasn't there, don't worry
                 if e.errno == ENOENT:
                     killdb = True
@@ -3684,7 +3684,7 @@ class DBConn(object):
             self.__setuptables()
             self.__setupmappers()
 
-        except OperationalError, e:
+        except OperationalError as e:
             import utils
             utils.fubar("Cannot connect to database (%s)" % str(e))
 

diff --git a/daklib/holding.py b/daklib/holding.py
index 2f36a696313badb4aad725685f1c1362df6c2765..221a25775a2832bcbea206ad18ffb7e9700687c3 100644 (file)
--- a/daklib/holding.py
+++ b/daklib/holding.py
@@ -60,7 +60,7 @@ class Holding(object):
         try:
             fd = os.open(dest, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0640)
             os.close(fd)
-        except OSError, e:
+        except OSError as e:
             # Shouldn't happen, but will if, for example, someone lists a
             # file twice in the .changes.
             if e.errno == EEXIST:
@@ -68,7 +68,7 @@ class Holding(object):
 
         try:
             shutil.copy(filename, dest)
-        except IOError, e:
+        except IOError as e:
             # In either case (ENOENT or EACCES) we want to remove the
             # O_CREAT | O_EXCLed ghost file, so add the file to the list
             # of 'in holding' even if it's not the real file.

diff --git a/daklib/metadata.py b/daklib/metadata.py
index d88cf4faf2a1ad0cd88675a182858c76c836cf12..793b073c927b530fe5c9fcef42801456b569995d 100755 (executable)
--- a/daklib/metadata.py
+++ b/daklib/metadata.py
@@ -66,7 +66,7 @@ class MetadataScanner(object):
             if self.verbose:
                 print "Imported %s (%s)" % (self.pkid, fullpath)
             session.commit()
-        except Exception, e:
+        except Exception as e:
             print "Failed to import %s [id=%s; fullpath=%s]" % (self.dbclass.__name__, self.pkid, fullpath)
             print "Exception: ", e
             session.rollback()

diff --git a/daklib/queue.py b/daklib/queue.py
index 82f3d9b9d9e971dea3783aa782f6f8fd843171db..12e027190d32fb61bc98bf2ad2e3fb9c92c8f05e 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -557,7 +557,7 @@ class Upload(object):
         except CantOpenError:
             self.rejects.append("%s: can't read file." % (filename))
             return False
-        except ParseChangesError, line:
+        except ParseChangesError as line:
             self.rejects.append("%s: parse error, can't grok: %s." % (filename, line))
             return False
         except ChangesUnicodeError:
@@ -567,10 +567,10 @@ class Upload(object):
         # Parse the Files field from the .changes into another dictionary
         try:
             self.pkg.files.update(utils.build_file_list(self.pkg.changes))
-        except ParseChangesError, line:
+        except ParseChangesError as line:
             self.rejects.append("%s: parse error, can't grok: %s." % (filename, line))
             return False
-        except UnknownFormatError, format:
+        except UnknownFormatError as format:
             self.rejects.append("%s: unknown format '%s'." % (filename, format))
             return False
 
@@ -608,7 +608,7 @@ class Upload(object):
              self.pkg.changes["maintainername"],
              self.pkg.changes["maintaineremail"]) = \
                    fix_maintainer (self.pkg.changes["maintainer"])
-        except ParseMaintError, msg:
+        except ParseMaintError as msg:
             self.rejects.append("%s: Maintainer field ('%s') failed to parse: %s" \
                    % (filename, self.pkg.changes["maintainer"], msg))
 
@@ -619,7 +619,7 @@ class Upload(object):
              self.pkg.changes["changedbyname"],
              self.pkg.changes["changedbyemail"]) = \
                    fix_maintainer (self.pkg.changes.get("changed-by", ""))
-        except ParseMaintError, msg:
+        except ParseMaintError as msg:
             self.pkg.changes["changedby822"] = ""
             self.pkg.changes["changedby2047"] = ""
             self.pkg.changes["changedbyname"] = ""
@@ -800,7 +800,7 @@ class Upload(object):
                         else:
                             entry["built-using"].append( (bu_so[0].source, bu_so[0].version, ) )
 
-            except ValueError, e:
+            except ValueError as e:
                 self.rejects.append("%s: Cannot parse Built-Using field: %s" % (f, str(e)))
 
 
@@ -1046,7 +1046,7 @@ class Upload(object):
                    or (dbc.in_queue is not None
                        and dbc.in_queue.queue_name not in ["unchecked", "newstage"]):
                 self.rejects.append("%s file already known to dak" % base_filename)
-        except NoResultFound, e:
+        except NoResultFound as e:
             # not known, good
             pass
 
@@ -1163,9 +1163,9 @@ class Upload(object):
         except CantOpenError:
             if not action:
                 return False, "%s: can't read file." % (dsc_filename)
-        except ParseChangesError, line:
+        except ParseChangesError as line:
             return False, "%s: parse error, can't grok: %s." % (dsc_filename, line)
-        except InvalidDscError, line:
+        except InvalidDscError as line:
             return False, "%s: syntax error on line %s." % (dsc_filename, line)
         except ChangesUnicodeError:
             return False, "%s: dsc file not proper utf-8." % (dsc_filename)
@@ -1199,10 +1199,10 @@ class Upload(object):
         except NoFilesFieldError:
             self.rejects.append("%s: no Files: field." % (dsc_filename))
             return False
-        except UnknownFormatError, format:
+        except UnknownFormatError as format:
             self.rejects.append("%s: unknown format '%s'." % (dsc_filename, format))
             return False
-        except ParseChangesError, line:
+        except ParseChangesError as line:
             self.rejects.append("%s: parse error, can't grok: %s." % (dsc_filename, line))
             return False
 
@@ -1232,7 +1232,7 @@ class Upload(object):
         try:
             # We ignore the return value
             fix_maintainer(self.pkg.dsc["maintainer"])
-        except ParseMaintError, msg:
+        except ParseMaintError as msg:
             self.rejects.append("%s: Maintainer field ('%s') failed to parse: %s" \
                                  % (dsc_filename, self.pkg.dsc["maintainer"], msg))
 
@@ -1325,7 +1325,7 @@ class Upload(object):
         # Extract the source
         try:
             unpacked = UnpackedSource(dsc_filename)
-        except Exception, e:
+        except Exception as e:
             self.rejects.append("'dpkg-source -x' failed for %s. (%s)" % (dsc_filename, str(e)))
             return
 
@@ -1376,7 +1376,7 @@ class Upload(object):
 
         try:
             shutil.rmtree(tmpdir)
-        except OSError, e:
+        except OSError as e:
             if e.errno != errno.EACCES:
                 print "foobar"
                 utils.fubar("%s: couldn't remove tmp dir for source tree." % (self.pkg.dsc["source"]))
@@ -1389,7 +1389,7 @@ class Upload(object):
             if result != 0:
                 utils.fubar("'%s' failed with result %s." % (cmd, result))
             shutil.rmtree(tmpdir)
-        except Exception, e:
+        except Exception as e:
             print "foobar2 (%s)" % e
             utils.fubar("%s: couldn't remove tmp dir for source tree." % (self.pkg.dsc["source"]))
 
@@ -1562,7 +1562,7 @@ class Upload(object):
 
         try:
             lintiantags = yaml.load(sourcecontent)['lintian']
-        except yaml.YAMLError, msg:
+        except yaml.YAMLError as msg:
             utils.fubar("Can not read the lintian tags file %s, YAML error: %s." % (tagfile, msg))
             return
 
@@ -1868,7 +1868,7 @@ class Upload(object):
         sourcecontent = sourcefile.read()
         try:
             transitions = yaml.load(sourcecontent)
-        except yaml.YAMLError, msg:
+        except yaml.YAMLError as msg:
             # This shouldn't happen, there is a wrapper to edit the file which
             # checks it, but we prefer to be safe than ending up rejecting
             # everything.
@@ -2343,7 +2343,7 @@ distribution."""
 
             try:
                 dest_fd = os.open(dest_file, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0644)
-            except OSError, e:
+            except OSError as e:
                 # File exists?  Let's find a new name by adding a number
                 if e.errno == errno.EEXIST:
                     try:
@@ -2357,7 +2357,7 @@ distribution."""
                     # Make sure we really got it
                     try:
                         dest_fd = os.open(dest_file, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644)
-                    except OSError, e:
+                    except OSError as e:
                         # Likewise
                         utils.warn("**WARNING** failed to claim %s in the reject directory." % (file_entry))
                         return

diff --git a/daklib/utils.py b/daklib/utils.py
index 8bc1b2c7c2c4db01405b6d375e8e30d2fb8981ad..46387ff2e14e55ed35ad1a311b7f393f94b29f51 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -350,7 +350,7 @@ def check_size(where, files):
     for f in files.keys():
         try:
             entry = os.stat(f)
-        except OSError, exc:
+        except OSError as exc:
             if exc.errno == 2:
                 # TODO: This happens when the file is in the pool.
                 continue
@@ -1549,7 +1549,7 @@ def get_changes_files(from_dir):
         # Much of the rest of p-u/p-a depends on being in the right place
         os.chdir(from_dir)
         changes_files = [x for x in os.listdir(from_dir) if x.endswith('.changes')]
-    except OSError, e:
+    except OSError as e:
         fubar("Failed to read list from directory %s (%s)" % (from_dir, e))
 
     return changes_files
@@ -1581,7 +1581,7 @@ def parse_wnpp_bug_file(file = "/srv/ftp-master.debian.org/scripts/masterfiles/w
     try:
         f = open(file)
         lines = f.readlines()
-    except IOError, e:
+    except IOError as e:
         print "Warning:  Couldn't open %s; don't know about WNPP bugs, so won't close any." % file
        lines = []
     wnpp = {}

diff --git a/tests/test_parse_changes.py b/tests/test_parse_changes.py
index 85a76948d193c5f4a8f4615eb71aa1fdc011236f..20dab4b9e51dfd0d30656a95ea7355941e205002 100755 (executable)
--- a/tests/test_parse_changes.py
+++ b/tests/test_parse_changes.py
@@ -20,7 +20,7 @@ class ParseChangesTestCase(DakTestCase):
             pass
         except GpgException:
             pass
-        except InvalidDscError, actual_line:
+        except InvalidDscError as actual_line:
             if line is not None:
                 assertEqual(actual_line, line)
 

diff --git a/tools/queue_rss.py b/tools/queue_rss.py
index 4e8c7ca25e8282497c0dc6eb99e8f6864cd006ab..fc1ad3deb0f1c57d7bc02d4db6b6b375f474a807 100755 (executable)
--- a/tools/queue_rss.py
+++ b/tools/queue_rss.py
@@ -103,7 +103,7 @@ def parse_leave_reason(fname):
 
     try:
         f = open(fname)
-    except IOError, e:
+    except IOError as e:
         sys.stderr.write("Can't open %s: %s\n" % (fname, e))
         return {}
 
@@ -210,7 +210,7 @@ if __name__ == "__main__":
     try:
         status.feed_in.write_xml(file(feed_in_file, "w+"), "utf-8")
         status.feed_out.write_xml(file(feed_out_file, "w+"), "utf-8")
-    except IOError, why:
+    except IOError as why:
         sys.stderr.write("Unable to write feeds: %s\n", why)
         sys.exit(1)
 
@@ -218,7 +218,7 @@ if __name__ == "__main__":
 
     try:
         cPickle.dump(status, open(status_db, "w+"))
-    except IOError, why:
+    except IOError as why:
         sys.stderr.write("Unable to save status: %s\n", why)
         sys.exit(1)