diff options
Diffstat (limited to 'PLD_Builder/request_fetcher.py')
| -rw-r--r-- | PLD_Builder/request_fetcher.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PLD_Builder/request_fetcher.py b/PLD_Builder/request_fetcher.py index dc87607..6122612 100644 --- a/PLD_Builder/request_fetcher.py +++ b/PLD_Builder/request_fetcher.py @@ -36,7 +36,7 @@ def has_new(control_url): cnt_f = open(path.last_req_no_file) try: last_count = int(string.strip(cnt_f.readline())) - except ValueError, e: + except ValueError as e: last_count = 0 cnt_f.close() @@ -50,7 +50,7 @@ def has_new(control_url): f = urllib2.urlopen(req) count = int(string.strip(f.readline())) signal.alarm(0) - except Exception, e: + except Exception as e: signal.alarm(0) log.error("can't fetch %s: %s" % (control_url + "/max_req_no", e)) sys.exit(1) @@ -69,7 +69,7 @@ def fetch_queue(control_url): req = urllib2.Request(url=control_url + "/queue.gz", headers=headers) f = urllib2.urlopen(req) signal.alarm(0) - except Exception, e: + except Exception as e: signal.alarm(0) log.error("can't fetch %s: %s" % (control_url + "/queue.gz", e)) sys.exit(1) @@ -80,7 +80,7 @@ def fetch_queue(control_url): f = gzip.GzipFile(fileobj = sio) try: fdata = f.read() - except struct.error, e: + except struct.error as e: log.alert("corrupted fetched queue.gz file") sys.exit(1) (signers, body) = gpg.verify_sig(fdata) @@ -102,7 +102,7 @@ def handle_reqs(builder, reqs): q.read() for r in reqs: if r.kind != 'group': - raise Exception, '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: |