Fix exception handling syntax (python3 compat)

[projects/pld-ftp-admin.git] / modules / ftptree.py

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 10fe86b1eb7fd8289d9d05c35cd690dd75e23066..e5b33c62347fb0fcb680de0f5df2fc0098681cc3 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -20,7 +20,7 @@ class SomeError(Exception):
 def bailoutonerror():
     if not errnum == 0:
         print("%d error(s) encountered... aborting" % errnum)
-        raise SomeError
+        raise SomeError()
 
 def pinfo(msg):
     print('INFO: ' + msg)
@@ -40,7 +40,7 @@ def rm(file, test = False):
     else:
         try:
             os.remove(file)
-        except OSError, e:
+        except OSError as e:
             pinfo("os.remove(%s): %s" % (file, e))
             #raise
 
@@ -55,7 +55,7 @@ def mv(src, dst, test = False):
     else:
         try:
             os.rename(fsrc, fdst)
-        except OSError, e:
+        except OSError as e:
             pinfo("os.rename(%s, %s): %s" % (fsrc, fdst, e))
             raise
 
@@ -282,7 +282,7 @@ class FtpTree(BaseFtpTree):
             self.loadedpkgs[key]=pkg
             return pkg
         else:
-            raise KeyError, key
+            raise KeyError(key)
 
     def has_key(self, key):
         if key in self.pkgnames: