Don't import with_statement from __future__.

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 1a25369789518406cfdd0fd293b4e73c74e03e02..905d2084a6827572f0349cc8e9a96454ceb6dba5 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -42,8 +42,6 @@
 
 ################################################################################
 
 
 ################################################################################
 

-from __future__ import with_statement
-

 import copy
 import errno
 import os
 import copy
 import errno
 import os


@@ -351,7 +349,7 @@ def check_pkg (upload):
                 elif ftype == "dsc":
                     print examine_package.check_dsc(changes['distribution'], f)
         print examine_package.output_package_relations()
                 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:
         if e.errno == errno.EPIPE:
             utils.warn("[examine_package] Caught EPIPE; skipping.")
         else:


@@ -616,7 +614,7 @@ def check_daily_lock():
 
         os.open(lockfile,
                 os.O_RDONLY | os.O_CREAT | os.O_EXCL)
 
         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
 
         if e.errno == errno.EEXIST or e.errno == errno.EACCES:
             raise CantGetLockError
 


@@ -638,7 +636,7 @@ def lock_package(package):
 
     try:
         fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDONLY)
 
     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
         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 +718,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"
 
                         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):
         print "Seems to be locked by %s already, skipping..." % (e)
 
 def show_new_comments(changes_files, session):


@@ -791,7 +789,7 @@ def main():
     if not Options["No-Action"]:
         try:
             Logger = daklog.Logger("process-new")
     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)
             Options["Trainee"] = "True"
 
     Sections = Section_Completer(session)