X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=daklib%2Futils.py;h=46387ff2e14e55ed35ad1a311b7f393f94b29f51;hp=8bc1b2c7c2c4db01405b6d375e8e30d2fb8981ad;hb=27e00376e81d1c37ff327ee0d39670b266418869;hpb=e956742235d6272e38424dc0c89b883153e776b7 diff --git a/daklib/utils.py b/daklib/utils.py index 8bc1b2c7..46387ff2 100755 --- 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 = {}