X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=subproc.py;h=7344a51bb4506f8f7f7bf32f6718a1299495b272;hb=ffdaa8835ae34cd5b9c712d962a5830e0edeed05;hp=a0099c290db088a168181802ee91153ac2b920c9;hpb=71900f3630cb51580964038b78100d60e3671981;p=bookmarks_db.git

diff --git a/subproc.py b/subproc.py
index a0099c2..7344a51 100644
--- a/subproc.py
+++ b/subproc.py
@@ -115,7 +115,7 @@ class Subprocess:
                 os.execvp(cmd[0], cmd)
                 os._exit(1)                     # Shouldn't get here
 
-            except os.error, e:
+            except os.error as e:
                 if self.control_stderr:
                     os.dup2(parentErr, 2)       # Reconnect to parent's stdout
                 sys.stderr.write("**execvp failed, '%s'**\n" %
@@ -133,7 +133,8 @@ class Subprocess:
             time.sleep(execvp_grace_seconds)
             try:
                 pid, err = os.waitpid(self.pid, os.WNOHANG)
-            except os.error, (errno, msg):
+            except os.error as error:
+                errno, msg = error
                 if errno == 10:
                     raise SubprocessError("Subprocess '%s' failed." % self.cmd)
                 raise SubprocessError("Subprocess failed[%d]: %s" % (errno, msg))
@@ -324,7 +325,7 @@ class Subprocess:
         # Only got here if subprocess is not gone:
         raise SubprocessError(
                "Failed kill of subproc %d, '%s', with signals %s" %
-                (self.pid, self.cmd, map(lambda(x): x[0], sigs)))
+                (self.pid, self.cmd, map(lambda x: x[0], sigs)))
 
     def __del__(self):
         """Terminate the subprocess"""