String exceptions are deprecated. Fix that.

Changed files:
    PLD_Builder/log.py -> 1.10
    PLD_Builder/request_fetcher.py -> 1.23
    PLD_Builder/rpm_builder.py -> 1.62
    PLD_Builder/srpm_builder.py -> 1.51
    PLD_Builder/util.py -> 1.10

diff --git a/PLD_Builder/log.py b/PLD_Builder/log.py
index db5a15d07ae80f43b5d5f08e7d3da6523996132b..76157db96d77919a9f5764274e763a66be15c501 100644 (file)
--- a/PLD_Builder/log.py
+++ b/PLD_Builder/log.py
@@ -21,7 +21,7 @@ def log(p, s):
     
 def panic(s):
     log(syslog.LOG_ALERT, "PANIC: %s" % s)
-    raise "PANIC: %s" % str(s)
+    raise Exception, "PANIC: %s" % str(s)
 
 def alert(s):
     log(syslog.LOG_ALERT, "alert: %s" % s) 

diff --git a/PLD_Builder/request_fetcher.py b/PLD_Builder/request_fetcher.py
index d85a6d798bc125551765e61796fc2a809b38559b..a23915db35d9c88eeed417bcc2542e57b7605311 100644 (file)
--- a/PLD_Builder/request_fetcher.py
+++ b/PLD_Builder/request_fetcher.py
@@ -89,7 +89,7 @@ def handle_reqs(builder, reqs):
     q.read()
     for r in reqs:
         if r.kind != 'group': 
-            raise 'handle_reqs: fatal: huh? %s' % r.kind
+            raise Exception, 'handle_reqs: fatal: huh? %s' % r.kind
         need_it = 0
         for b in r.batches:
             if builder in b.builders:

diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 3143040bbacd63ae8b3d05276e95706e936fe6b0..211f4fffc605147b1226163d341a446d3ddc5664 100644 (file)
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -42,7 +42,7 @@ socket.socket=mysocket
 def pick_request(q):
     def mycmp(r1, r2):
         if r1.kind != 'group' or r2.kind != 'group':
-            raise "non-group requests"
+            raise Exception, "non-group requests"
         pri_diff = cmp(r1.priority, r2.priority)
         if pri_diff == 0:
             return cmp(r1.time, r2.time)
@@ -268,7 +268,7 @@ def main_for(builder):
     
 def main():
     if len(sys.argv) < 2:
-        raise "fatal: need to have builder name as first arg"
+        raise Exception, "fatal: need to have builder name as first arg"
     return main_for(sys.argv[1])
     
 if __name__ == '__main__':

diff --git a/PLD_Builder/srpm_builder.py b/PLD_Builder/srpm_builder.py
index 2d41a9461c8682101338dce2acf354a129c51bea..309f197901d6b127fd1aaad967e2cc83b63f307e 100644 (file)
--- a/PLD_Builder/srpm_builder.py
+++ b/PLD_Builder/srpm_builder.py
@@ -29,7 +29,7 @@ from config import config, init_conf
 def pick_request(q):
     def mycmp(r1, r2):
         if r1.kind != 'group' or r2.kind != 'group':
-            raise "non-group requests"
+            raise Exception, "non-group requests"
         pri_diff = cmp(r1.priority, r2.priority)
         if pri_diff == 0:
             return cmp(r1.time, r2.time)

diff --git a/PLD_Builder/util.py b/PLD_Builder/util.py
index d7a20a2e28e9e3a441c25f4b202603eefbce2fc9..ac1830d45f3d0ae66c50e04592ed748dbc3f6bca 100644 (file)
--- a/PLD_Builder/util.py
+++ b/PLD_Builder/util.py
@@ -14,7 +14,7 @@ def uuid_external():
     u = string.strip(f.read())
     f.close()
     if len(u) != 36:
-        raise "uuid: fatal, cannot generate uuid: %s" % u
+        raise Exception, "uuid: fatal, cannot generate uuid: %s" % u
     return u
 
 # uuid module available in python >= 2.5