Convert raise statement to Python 2.6.

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

diff --git a/dak/dakdb/update1.py b/dak/dakdb/update1.py
index ede12e56c949315ccd3790d7d212cae455569be5..21942765e560b056d167d3755e409fe73d5343c0 100755 (executable)
--- a/dak/dakdb/update1.py
+++ b/dak/dakdb/update1.py
@@ -66,4 +66,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy DM table updates, rollback issued. Error message : %s" % (str(msg))
+        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 52a5d0be164a829e350b19b4918dba59a977f963..31c70d379206504bf48b56ef7570f2137bb1bbfe 100755 (executable)
--- a/dak/dakdb/update10.py
+++ b/dak/dakdb/update10.py
@@ -53,4 +53,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg))
+        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 6569f8ebb144ab3fd7b0e47118ec706503600b89..17001d391f58c00719c5c29b607044154be6a83a 100755 (executable)
--- a/dak/dakdb/update11.py
+++ b/dak/dakdb/update11.py
@@ -60,4 +60,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new comments update, rollback issued. Error message : %s" % (str(msg))
+        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 1141c5992dc7aae000d6cc728999e717b477be57..21d44a4598103ddc54b2912eb616660f6de74fd4 100755 (executable)
--- a/dak/dakdb/update12.py
+++ b/dak/dakdb/update12.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new update 12, rollback issued. Error message : %s" % (str(msg))
+        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 ddb79780117d9adbd850e975da2ce4e4fd269b6f..1696e75920ed9d6a7146f31336b68c7ab48a4fb8 100755 (executable)
--- a/dak/dakdb/update13.py
+++ b/dak/dakdb/update13.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new update 13, rollback issued. Error message : %s" % (str(msg))
+        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 44b061b1e76bd9fd3f2a5d7af616dcd4e558970d..575e5d234a2866433d49a0565dcd348d60b00a90 100755 (executable)
--- a/dak/dakdb/update14.py
+++ b/dak/dakdb/update14.py
@@ -50,4 +50,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new update 14, rollback issued. Error message : %s" % (str(msg))
+        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 3074ff09238c6630fcd6a2efb730df68626f0e18..7d6b52e7588e3988d52cba08b6e9729e1e92152b 100755 (executable)
--- a/dak/dakdb/update15.py
+++ b/dak/dakdb/update15.py
@@ -81,4 +81,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply source format update 15, rollback issued. Error message : %s" % (str(msg))
+        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 d64c2220b28617fd2231c5c1ab2ceafd32a0e3f4..6cd6dc4b1b7af19566cc26901e77588f6402a288 100755 (executable)
--- a/dak/dakdb/update16.py
+++ b/dak/dakdb/update16.py
@@ -175,4 +175,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply ACLs update (16), rollback issued. Error message : %s" % (str(msg))
+        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 8fc3bd058f0cec4c43fb31e31d4603f1f7b46f30..493640eb9ff6a79df097a345d17424a5ebbcc1ad 100755 (executable)
--- a/dak/dakdb/update17.py
+++ b/dak/dakdb/update17.py
@@ -60,7 +60,7 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new update 17, rollback issued. Error message : %s" % (str(msg))
+        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 eb8efa4a4cbc943401e1fad9afd2b3bc4edb3170..bdf241084262522f86a95029b810ae17126c87ee 100755 (executable)
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -153,4 +153,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply knownchanges update 18, rollback issued. Error message : %s" % (str(msg))
+        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 5186ded626654768cbe830e89792eea63033ebe8..61e607033f4b4c1a1454d6677c3c1d02679a01f6 100755 (executable)
--- a/dak/dakdb/update19.py
+++ b/dak/dakdb/update19.py
@@ -104,4 +104,4 @@ def do_update(self):
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply debversion update 19, rollback issued. Error message : %s" % (str(msg))
+        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 9ad0da5d573cacc5b4e166a20d109e203c87b8dc..0d9d387162fa45a9f0e23ae2ab1ab07fd86a352d 100755 (executable)
--- a/dak/dakdb/update2.py
+++ b/dak/dakdb/update2.py
@@ -398,4 +398,4 @@ $$
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))
+        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 70572fcb0917547f92171d57fbacdde2b19538c0..c1424ab2da502aa8c236dcfb4dc2d0f8ba1ad912 100755 (executable)
--- a/dak/dakdb/update20.py
+++ b/dak/dakdb/update20.py
@@ -97,4 +97,4 @@ def do_update(self):
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply debversion update 20, rollback issued. Error message : %s" % (str(msg))
+        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 2555e4c74715bbf73d9a000f8378172e04a6ecac..c91b6f1410e4cd486fd6fd4737a84d710326bd45 100755 (executable)
--- a/dak/dakdb/update21.py
+++ b/dak/dakdb/update21.py
@@ -126,4 +126,4 @@ def do_update(self):
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply queue_build 21, rollback issued. Error message : %s" % (str(msg))
+        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 81f20037ee0f674dc91ee37d155a9789ecf37a7b..5c852c67024f0b6a73e4595d51c3ae4f33067ebb 100755 (executable)
--- a/dak/dakdb/update22.py
+++ b/dak/dakdb/update22.py
@@ -237,4 +237,4 @@ def do_update(self):
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply queue_build 21, rollback issued. Error message : %s" % (str(msg))
+        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 922322b35fe8a1b21f7b82b553d8282a34a399d8..4750c153b767fe21091a27865132b78cd091a9f1 100755 (executable)
--- a/dak/dakdb/update23.py
+++ b/dak/dakdb/update23.py
@@ -60,5 +60,5 @@ CREATE VIEW srcfiles_suite_component AS
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Database error, rollback issued. Error message : %s" % (str(msg)))
 

diff --git a/dak/dakdb/update24.py b/dak/dakdb/update24.py
index 83047668c633a451158dee4a6915d7ebee9bcdcb..64deb96e9291bcfd5e5f102068131384fe943a3a 100755 (executable)
--- a/dak/dakdb/update24.py
+++ b/dak/dakdb/update24.py
@@ -58,5 +58,5 @@ def do_update(self):
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Database error, rollback issued. Error message : %s" % (str(msg)))
 

diff --git a/dak/dakdb/update25.py b/dak/dakdb/update25.py
index 3fc8c558f76947a3917a45b574a4ec3eb7297b9a..0ce8ab6e1298645203c4dad206bfe91efbc974ed 100755 (executable)
--- a/dak/dakdb/update25.py
+++ b/dak/dakdb/update25.py
@@ -185,5 +185,5 @@ CREATE VIEW obsolete_all_associations AS
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Database error, rollback issued. Error message : %s" % (str(msg)))
 

diff --git a/dak/dakdb/update26.py b/dak/dakdb/update26.py
index 4329bc3aed7c3c29aa674f7a64e385a8b56ad601..358f2ae46907ed5be49516dfe458e85aee523480 100755 (executable)
--- a/dak/dakdb/update26.py
+++ b/dak/dakdb/update26.py
@@ -63,5 +63,5 @@ def do_update(self):
 
     except psycopg2.InternalError as msg:
             self.db.rollback()
-            raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
+            raise DBUpdateError("Database error, rollback issued. Error message : %s" % (str(msg)))
 

diff --git a/dak/dakdb/update27.py b/dak/dakdb/update27.py
index 7a492a3f2f399e5448747fe4e19b74a3f03fa362..814e60150ad8ebba93e20bbf724f50ece1a2b00f 100755 (executable)
--- a/dak/dakdb/update27.py
+++ b/dak/dakdb/update27.py
@@ -76,5 +76,5 @@ CREATE OR REPLACE VIEW bin_associations_binaries AS
 
     except psycopg2.InternalError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Database error, rollback issued. Error message : %s" % (str(msg)))
 

diff --git a/dak/dakdb/update28.py b/dak/dakdb/update28.py
index c899831ca527784008d29a6ddaf7051e54a9608c..1455ee3110284d3cdd4d48effd237f1d0a1fc2d0 100755 (executable)
--- a/dak/dakdb/update28.py
+++ b/dak/dakdb/update28.py
@@ -267,5 +267,5 @@ $$ LANGUAGE plpythonu VOLATILE;""")
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new update 28, rollback issued. Error message : %s" % (str(msg))
+        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 66600b6312915d4ea6816205f37dcc06de478e22..c77d99dad5229510534fd08ffc773914b7d71ba4 100644 (file)
--- a/dak/dakdb/update29.py
+++ b/dak/dakdb/update29.py
@@ -49,4 +49,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))
+        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 1eab89f66e45e2147403268b0984d8e60bce5670..f7a4e5026e3c79908c208040f5a46d9ab273169c 100755 (executable)
--- a/dak/dakdb/update3.py
+++ b/dak/dakdb/update3.py
@@ -51,4 +51,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy versioncmp removal, rollback issued. Error message : %s" % (str(msg))
+        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 fe591614dd51af6034e8962c89ce6bbe6d1f046f..f68c74a34a5f7baaaeb5be8f59aa743ebfd6c777 100644 (file)
--- a/dak/dakdb/update30.py
+++ b/dak/dakdb/update30.py
@@ -97,4 +97,4 @@ $$ LANGUAGE plpythonu VOLATILE SECURITY DEFINER;
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))
+        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 dc4245cce87a156a2d4b5e1bc5f49f27a2b04fdb..7209178b3ca0a6d3347e2c8d4bd189264fe00f42 100644 (file)
--- a/dak/dakdb/update31.py
+++ b/dak/dakdb/update31.py
@@ -96,5 +96,5 @@ $$ LANGUAGE plpythonu VOLATILE SECURITY DEFINER;
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply process-new update 31, rollback issued. Error message : %s" % (str(msg))
+        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 c0882fb1ccfb42c5f62c23bdd938baef3902094e..59355c91a3af811c063caed8e8365767da7f3329 100755 (executable)
--- a/dak/dakdb/update32.py
+++ b/dak/dakdb/update32.py
@@ -46,5 +46,5 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply build_queue update 32, rollback issued. Error message : %s" % (str(msg))
+        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 d3867af32471151dfc876c9d1f687d278a16c577..5b0fe110d4dab1dad30ecf27c575d85ccd6db12a 100644 (file)
--- a/dak/dakdb/update33.py
+++ b/dak/dakdb/update33.py
@@ -52,4 +52,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply build_queue update 33, rollback issued. Error message : %s' % (str(msg))
+        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 35351c249c868d24bf2a03622717a29de60c31c0..03f15739438bcae0ee28bf3f8ffc5194799495f1 100644 (file)
--- a/dak/dakdb/update34.py
+++ b/dak/dakdb/update34.py
@@ -45,4 +45,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply build_queue update 34, rollback issued. Error message : %s' % (str(msg))
+        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 cc289e41cc08234a422e3969189c4d0b40262d7c..41d56674aff70d80e6666ae71a36c037b0880317 100644 (file)
--- a/dak/dakdb/update35.py
+++ b/dak/dakdb/update35.py
@@ -47,4 +47,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply build_queue update 35, rollback issued. Error message : %s' % (str(msg))
+        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 c672d8d7b6ffd7d1d6298f9e859380be877b3668..432e09f3653f65b1f0202bf126d407c18d796380 100644 (file)
--- a/dak/dakdb/update36.py
+++ b/dak/dakdb/update36.py
@@ -45,4 +45,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply build_queue update 36, rollback issued. Error message : %s' % (str(msg))
+        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 136f464976d45c737a5fb2b119446fcdb9164921..7ab52e04ca52ab9580d700822392c9826a97d772 100755 (executable)
--- a/dak/dakdb/update37.py
+++ b/dak/dakdb/update37.py
@@ -54,4 +54,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply table-colum update 37, rollback issued. Error message : %s' % (str(msg))
+        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 28a411baf975ddf5290f4cfe178192a0748add81..da3a1d6596e9aa473a28f0fb6aa85a5557f94282 100755 (executable)
--- a/dak/dakdb/update38.py
+++ b/dak/dakdb/update38.py
@@ -53,4 +53,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply table-column update 38, rollback issued. Error message : %s' % (str(msg))
+        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 c97b4f062505635c99e7b9a6575e32edea672bd9..c02b9629f0d34536da1c2b5286754dfc5d289217 100644 (file)
--- a/dak/dakdb/update39.py
+++ b/dak/dakdb/update39.py
@@ -44,4 +44,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply table-column update 39, rollback issued. Error message : %s' % (str(msg))
+        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 169653fa4397caa7f4fd9e89b67b873553c419f7..938522ccd83cddacc7d9765cd360c2c6d034f1c5 100755 (executable)
--- a/dak/dakdb/update4.py
+++ b/dak/dakdb/update4.py
@@ -66,4 +66,4 @@ def do_update(self):
 
     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))
+        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 a13ec10bf227e5614db5c6bc55ca38841ecc8f5e..e3bb89e0570307331e6ab978790a48cc72b9b496 100755 (executable)
--- a/dak/dakdb/update40.py
+++ b/dak/dakdb/update40.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 40, rollback issued. Error message : %s' % (str(msg))
+        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 5243cd6704d4c1b004c5c7d4d92cedb9d8196aca..65661d3c420eae1c441ed948203bf1f9128e0b5e 100755 (executable)
--- a/dak/dakdb/update41.py
+++ b/dak/dakdb/update41.py
@@ -63,4 +63,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 41, rollback issued. Error message : %s' % (str(msg))
+        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 bfd4b1fc5d933721c89489a4de7792181c87e37e..3c51232c8735a98540208eba39a1ed4e715f4611 100755 (executable)
--- a/dak/dakdb/update42.py
+++ b/dak/dakdb/update42.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply update 42, rollback issued. Error message : %s' % (str(msg))
+        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 38bc29a17509d22de2410cd697f16061d93906e9..430cc3581dc42c98a9666719612e2f004ba95418 100755 (executable)
--- a/dak/dakdb/update43.py
+++ b/dak/dakdb/update43.py
@@ -48,4 +48,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply update 43, rollback issued. Error message : %s' % (str(msg))
+        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 1b4a5714e1194b353ee25adb75ef614d6121f3ff..bce1fe7db3fcd00934836e2f2899c8435662348c 100755 (executable)
--- a/dak/dakdb/update44.py
+++ b/dak/dakdb/update44.py
@@ -49,4 +49,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 44, rollback issued. Error message : %s' % (str(msg))
+        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 8de1e67059ecfe9845ac156298103c75c0b31e35..fe84c9be87627b1d800de02ad6b9e05c4e1b9b84 100755 (executable)
--- a/dak/dakdb/update45.py
+++ b/dak/dakdb/update45.py
@@ -50,4 +50,4 @@ CREATE TABLE extra_src_references (
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply update 45, rollback issued. Error message : %s' % (str(msg))
+        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 55a382fac1e68292eeba0e76a8a2de4e875621b5..109a887aa93a0ceba459fd930d474e215c5aeb5f 100755 (executable)
--- a/dak/dakdb/update46.py
+++ b/dak/dakdb/update46.py
@@ -74,4 +74,4 @@ CREATE TABLE source_metadata (
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply update 46, rollback issued. Error message : %s' % (str(msg))
+        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 c93ffb84fee91d25a5dc3163823894a6d8e48849..a6626594fb99ed96ccd8bfa01d8a5e5c59e38e12 100755 (executable)
--- a/dak/dakdb/update47.py
+++ b/dak/dakdb/update47.py
@@ -49,4 +49,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 47, rollback issued. Error message : %s' % (str(msg))
+        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 3bc0f8936e3f8013ce0410a63b8ede3460434ead..63a8a0e656fa79058279a00fc2c8c07ab6b87f3d 100755 (executable)
--- a/dak/dakdb/update48.py
+++ b/dak/dakdb/update48.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 48, rollback issued. Error message : %s' % (str(msg))
+        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 44e1f9fca67e677d05f48e3f98d28fb0c4daa1de..720f8cf3a2c070072f321753bb9205eda2a401fc 100755 (executable)
--- a/dak/dakdb/update49.py
+++ b/dak/dakdb/update49.py
@@ -58,4 +58,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 49, rollback issued. Error message : %s' % (str(msg))
+        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 7c892a7a0e1fc51acc4bcc7a7b21a04c4650245a..a42e540cdabd01dc10c4f453fc5105fa2a2ecce0 100755 (executable)
--- a/dak/dakdb/update5.py
+++ b/dak/dakdb/update5.py
@@ -48,4 +48,4 @@ def do_update(self):
 
     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))
+        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 568c33bc0dd0bb882412990526a658fc819fb284..094998771033509d941db63c0438977ccebfdab1 100755 (executable)
--- a/dak/dakdb/update50.py
+++ b/dak/dakdb/update50.py
@@ -44,4 +44,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 50, rollback issued. Error message : %s' % (str(msg))
+        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 02a8fc233b0d057b87a94f4d50388e7e1cd3205f..2d4c1a2c22bf849316fb5cac78e156d6be54f66d 100755 (executable)
--- a/dak/dakdb/update51.py
+++ b/dak/dakdb/update51.py
@@ -55,4 +55,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 51, rollback issued. Error message : %s' % (str(msg))
+        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 938b3ceaf773b2aab301bf00f23493ee16116b75..aa7a10d16fa62e95650ab1cf10c48fc886aee2fb 100755 (executable)
--- a/dak/dakdb/update52.py
+++ b/dak/dakdb/update52.py
@@ -63,4 +63,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 52, rollback issued. Error message : %s' % (str(msg))
+        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 a2c8a0a3348362b51ced4ff3c25bc320ed76a37f..92508257e08f7104f1931b62fc79ee265d89cfe8 100755 (executable)
--- a/dak/dakdb/update53.py
+++ b/dak/dakdb/update53.py
@@ -52,4 +52,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 53, rollback issued. Error message : %s' % (str(msg))
+        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 3922f69bdc726391e60e2b168e14ddde904165e5..c218cc670cf094f94188edcdc76be40836b3d102 100755 (executable)
--- a/dak/dakdb/update54.py
+++ b/dak/dakdb/update54.py
@@ -49,4 +49,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 54, rollback issued. Error message : %s' % (str(msg))
+        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 8dfc4a58f4f2d97712a3088032ef46f5eea125cc..9e152227daaa2a96f2303ee3ae8e065f8539a4d2 100755 (executable)
--- a/dak/dakdb/update55.py
+++ b/dak/dakdb/update55.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 55, rollback issued. Error message : %s' % (str(msg))
+        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 58ecc9f211d9cb41fc8920dcba26e2fe2388cd4b..647f8c799ade92962a561f0f58d2fae2d2dbd263 100755 (executable)
--- a/dak/dakdb/update56.py
+++ b/dak/dakdb/update56.py
@@ -87,4 +87,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 56, rollback issued. Error message : %s' % (str(msg))
+        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 1b6ddc8a143cb11afd9562694a3f34196d2be9e8..db49db43427d67e7f5f03c0a5ad6df6b4fafd94a 100755 (executable)
--- a/dak/dakdb/update57.py
+++ b/dak/dakdb/update57.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 57, rollback issued. Error message : %s' % (str(msg))
+        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 802a5167689e2259bffda158ec6eebbfbac70098..9f10d31b93f8dbb30740027a7af9eee7846d07a4 100755 (executable)
--- a/dak/dakdb/update58.py
+++ b/dak/dakdb/update58.py
@@ -87,4 +87,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 58, rollback issued. Error message : %s' % (str(msg))
+        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 ec3f07f8acb811d4c23d9a85b7e71963cfc2a37f..fd6fea55e41229c09d0a97b153ee616488880556 100755 (executable)
--- a/dak/dakdb/update59.py
+++ b/dak/dakdb/update59.py
@@ -53,4 +53,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 59, rollback issued. Error message : %s' % (str(msg))
+        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 78a04f5fc5321a869e91017603a627a8f56101d9..f3d11bbc82ad8f293338e8fc31b48dc4f653d7a1 100755 (executable)
--- a/dak/dakdb/update6.py
+++ b/dak/dakdb/update6.py
@@ -89,4 +89,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy debversion updates, rollback issued. Error message : %s" % (str(msg))
+        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 dc61eaca4f1fbbb5a0a74127f62cb1db913964af..0173529628b31b583d040e70a9b1ffdbf3233b50 100755 (executable)
--- a/dak/dakdb/update60.py
+++ b/dak/dakdb/update60.py
@@ -53,4 +53,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 60, rollback issued. Error message : %s' % (str(msg))
+        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 d8b47ec84a3f6f332b03549e154145fdac329540..3b18e0b37654e97950161f2580c2af525636be28 100755 (executable)
--- a/dak/dakdb/update61.py
+++ b/dak/dakdb/update61.py
@@ -52,4 +52,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 61, rollback issued. Error message : %s' % (str(msg))
+        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 597a19cbbfd77a50c1346899fd994d8d9b07d7ad..7a47dca8f864c4c9bf8cb9f1d4d2c5a7e9c1bd69 100755 (executable)
--- a/dak/dakdb/update62.py
+++ b/dak/dakdb/update62.py
@@ -44,4 +44,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 62, rollback issued. Error message : %s' % (str(msg))
+        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 9d2cce68de799b4930571230176599b4689ed4f0..e9e5c0f1912eb1b1aca643fcd8faaa7f0c9e2d65 100755 (executable)
--- a/dak/dakdb/update63.py
+++ b/dak/dakdb/update63.py
@@ -56,4 +56,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 63, rollback issued. Error message : %s' % (str(msg))
+        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 b34a8787df6dcdad525651cf0795788bb793d943..49ca75a8e4281e40c87d4d6c90d537da7dbfe112 100755 (executable)
--- a/dak/dakdb/update64.py
+++ b/dak/dakdb/update64.py
@@ -46,4 +46,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 64, rollback issued. Error message : %s' % (str(msg))
+        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 76bfe61a6891d87e1cee5d484f97816f588ab844..46730b5fcaaa1e7376ab000c453ada586e348ae5 100755 (executable)
--- a/dak/dakdb/update65.py
+++ b/dak/dakdb/update65.py
@@ -48,4 +48,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 65, rollback issued. Error message : %s' % (str(msg))
+        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 2a59c7134760cb206ea4f022729a31aa9d3e1d01..d59306fa6536001990df09b3bb4fdee072ea21af 100755 (executable)
--- a/dak/dakdb/update66.py
+++ b/dak/dakdb/update66.py
@@ -57,4 +57,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply sick update 66, rollback issued. Error message : %s' % (str(msg))
+        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 7e5c2091652fd881ef406a0404ba079729aa8138..9c3dd1ed6662f4faa8eb2ea5cb5f9515297f0c18 100755 (executable)
--- a/dak/dakdb/update7.py
+++ b/dak/dakdb/update7.py
@@ -118,4 +118,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to appy suite config updates, rollback issued. Error message : %s" % (str(msg))
+        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 1c86c866bbb7df137f34c8004800e8994bcf0f05..98e0f088048e06c2981c80ac7ad8d33f57844b7e 100755 (executable)
--- a/dak/dakdb/update8.py
+++ b/dak/dakdb/update8.py
@@ -101,4 +101,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg))
+        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 20af71fd23f9e151b3b935f44bcb855328a00f43..bbdd212206653ab7b525d19282187c64c9604fee 100755 (executable)
--- a/dak/dakdb/update9.py
+++ b/dak/dakdb/update9.py
@@ -59,4 +59,4 @@ def do_update(self):
 
     except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to apply suite config updates, rollback issued. Error message : %s" % (str(msg)))

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 75142ca78eab2cfc494145b7542d43f5d9bd15e1..3297c42cfebf23729b524df67f75f0965c7e280b 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -81,7 +81,7 @@ def smartlink(f, t):
         os.system("bzip2 -d < %s.bz2 > %s" % (f, t))
     else:
         print "missing: %s" % (f)
-        raise IOError, f
+        raise IOError(f)
 
 def smartopen(file):
     if os.path.isfile(file):

diff --git a/dak/process_new.py b/dak/process_new.py
index 905d2084a6827572f0349cc8e9a96454ceb6dba5..1c2231a305709baf6ff7379fd55fbbe9868ce1d0 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -639,7 +639,7 @@ def lock_package(package):
     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
+            raise AlreadyLockedError(user)
 
     try:
         yield fd

diff --git a/dak/transitions.py b/dak/transitions.py
index a5b8fa3529edda25a90f5bab80ebcd2f98b0e8e7..a5eb6b6cd1e5338861b27cfb61e15a7644ca9d2d 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -297,7 +297,7 @@ def write_transitions_from_file(from_file):
     else:
         trans = load_transitions(from_file)
         if trans is None:
-            raise TransitionsError, "Unparsable transitions file %s" % (file)
+            raise TransitionsError("Unparsable transitions file %s" % (file))
         write_transitions(trans)
 
 ################################################################################

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 4e01b610ce1789acffd9272d8559c34f86542795..3800149283cec1ded120d08ffc8313eaed828f11 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2824,9 +2824,9 @@ def add_deb_to_db(u, filename, session=None):
     # Find source id
     bin_sources = get_sources_from_name(entry["source package"], entry["source version"], session=session)
     if len(bin_sources) != 1:
-        raise NoSourceFieldError, "Unable to find a unique source id for %s (%s), %s, file %s, type %s, signed by %s" % \
+        raise NoSourceFieldError("Unable to find a unique source id for %s (%s), %s, file %s, type %s, signed by %s" % \
                                   (bin.package, bin.version, entry["architecture"],
-                                   filename, bin.binarytype, u.pkg.changes["fingerprint"])
+                                   filename, bin.binarytype, u.pkg.changes["fingerprint"]))
 
     bin.source_id = bin_sources[0].source_id
 
@@ -2834,9 +2834,9 @@ def add_deb_to_db(u, filename, session=None):
         for srcname, version in entry["built-using"]:
             exsources = get_sources_from_name(srcname, version, session=session)
             if len(exsources) != 1:
-                raise NoSourceFieldError, "Unable to find source package (%s = %s) in Built-Using for %s (%s), %s, file %s, type %s, signed by %s" % \
+                raise NoSourceFieldError("Unable to find source package (%s = %s) in Built-Using for %s (%s), %s, file %s, type %s, signed by %s" % \
                                           (srcname, version, bin.package, bin.version, entry["architecture"],
-                                           filename, bin.binarytype, u.pkg.changes["fingerprint"])
+                                           filename, bin.binarytype, u.pkg.changes["fingerprint"]))
 
             bin.extra_sources.append(exsources[0])
 

diff --git a/daklib/formats.py b/daklib/formats.py
index edc80533832719cc531209f7194003f70c58ac01..bcd42f61b01aec959d8be734173d2627a9dffbae 100755 (executable)
--- a/daklib/formats.py
+++ b/daklib/formats.py
@@ -58,7 +58,7 @@ def parse_format(txt):
     format = re_verwithext.search(txt)
 
     if format is None:
-        raise UnknownFormatError, txt
+        raise UnknownFormatError(txt)
 
     format = format.groups()
 
@@ -80,7 +80,7 @@ def validate_changes_format(format, field):
     """
 
     if (format < (1, 5) or format > (1, 8)):
-        raise UnknownFormatError, repr(format)
+        raise UnknownFormatError(repr(format))
 
     if field != 'files' and format < (1, 8):
-        raise UnknownFormatError, repr(format)
+        raise UnknownFormatError(repr(format))

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 85ac701fe38bad3a07c794569bfcb3af019f455d..050691fe3b474f5b7d7feff10bbeac15dd3344f3 100755 (executable)
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -48,7 +48,7 @@ def get_format_from_string(txt):
         if format.re_format.match(txt):
             return format
 
-    raise UnknownFormatError, "Unknown format %r" % txt
+    raise UnknownFormatError("Unknown format %r" % txt)
 
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):

diff --git a/daklib/textutils.py b/daklib/textutils.py
index 3cbcec739cb9e803ecb496550d3a0def64b45b86..03df5d8590657c9273b5eb1e7fac05db2a0ce19c 100644 (file)
--- a/daklib/textutils.py
+++ b/daklib/textutils.py
@@ -88,7 +88,7 @@ def fix_maintainer(maintainer):
     else:
         m = re_parse_maintainer.match(maintainer)
         if not m:
-            raise ParseMaintError, "Doesn't parse as a valid Maintainer field."
+            raise ParseMaintError("Doesn't parse as a valid Maintainer field.")
         name = m.group(1)
         email = m.group(2)
 
@@ -106,7 +106,7 @@ def fix_maintainer(maintainer):
         rfc2047_maint = "%s <%s>" % (rfc2047_name, email)
 
     if email.find("@") == -1 and email.find("buildd_") != 0:
-        raise ParseMaintError, "No @ found in email address part."
+        raise ParseMaintError("No @ found in email address part.")
 
     return (rfc822_maint, rfc2047_maint, name, email)
 

diff --git a/daklib/utils.py b/daklib/utils.py
index 6f352cd0c8b6157b27f631c1db26a688349785fd..40e47c63e45830887d213f10d8d381ebd75457a3 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -115,7 +115,7 @@ def open_file(filename, mode='r'):
     try:
         f = open(filename, mode)
     except IOError:
-        raise CantOpenError, filename
+        raise CantOpenError(filename)
     return f
 
 ################################################################################
@@ -172,7 +172,7 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None)
     lines = contents.splitlines(True)
 
     if len(lines) == 0:
-        raise ParseChangesError, "[Empty changes file]"
+        raise ParseChangesError("[Empty changes file]")
 
     # Reindex by line number so we can easily verify the format of
     # .dsc files...
@@ -190,7 +190,7 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None)
         line = indexed_lines[index]
         if line == "" and signing_rules == 1:
             if index != num_of_lines:
-                raise InvalidDscError, index
+                raise InvalidDscError(index)
             break
         slf = re_single_line_field.match(line)
         if slf:
@@ -204,7 +204,7 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None)
         mlf = re_multi_line_field.match(line)
         if mlf:
             if first == -1:
-                raise ParseChangesError, "'%s'\n [Multi-line field continuing on from nothing?]" % (line)
+                raise ParseChangesError("'%s'\n [Multi-line field continuing on from nothing?]" % (line))
             if first == 1 and changes[field] != "":
                 changes[field] += '\n'
             first = 0
@@ -223,7 +223,7 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None)
             changes["source-version"] = srcver.group(2)
 
     if error:
-        raise ParseChangesError, error
+        raise ParseChangesError(error)
 
     return changes
 
@@ -257,7 +257,7 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
     try:
         unicode(content, 'utf-8')
     except UnicodeError:
-        raise ChangesUnicodeError, "Changes file not proper utf-8"
+        raise ChangesUnicodeError("Changes file not proper utf-8")
     changes = parse_deb822(content, signing_rules, keyrings=keyrings)
 
 
@@ -272,7 +272,7 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
                 missingfields.append(keyword)
 
                 if len(missingfields):
-                    raise ParseChangesError, "Missing mandantory field(s) in changes file (policy 5.5): %s" % (missingfields)
+                    raise ParseChangesError("Missing mandantory field(s) in changes file (policy 5.5): %s" % (missingfields))
 
     return changes
 
@@ -559,7 +559,7 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
             else:
                 (md5, size, name) = s
         except ValueError:
-            raise ParseChangesError, i
+            raise ParseChangesError(i)
 
         if section == "":
             section = "-"
@@ -694,7 +694,7 @@ def send_mail (message, filename=""):
     # Invoke sendmail
     (result, output) = commands.getstatusoutput("%s < %s" % (Cnf["Dinstall::SendmailCommand"], filename))
     if (result != 0):
-        raise SendmailFailedError, output
+        raise SendmailFailedError(output)
 
     # Clean up any temporary files
     if message: