Merge branch 'issue-44-solaris-try-3' of github.com:pexpect/pexpect i…

…nto issue-44-solaris-try-3
pexpect · Jun 24, 2014 · 1ef9088 · 1ef9088
2 parents 3a5a8a6 + 033393a
commit 1ef9088
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pexpect/__init__.py b/pexpect/__init__.py
@@ -727,7 +727,7 @@ def __pty_make_controlling_tty(self, tty_fd):
         try:
             fd = os.open("/dev/tty", os.O_RDWR | os.O_NOCTTY)
             os.close(fd)
-        except OSError, err:
+        except OSError as err:
             if err.errno != errno.ENXIO:
                 raise
 
@@ -739,7 +739,7 @@ def __pty_make_controlling_tty(self, tty_fd):
             fd = os.open("/dev/tty", os.O_RDWR | os.O_NOCTTY)
             os.close(fd)
             raise ExceptionPexpect("OSError of errno.ENXIO should be raised.")
-        except OSError, err:
+        except OSError as err:
             if err.errno != errno.ENXIO:
                 raise