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

2 files changed, 3 insertions, 3 deletions

diff --git a/DEVELOPERS.rst b/DEVELOPERS.rst
index d5e4475..bf2bb9f 100644
--- a/DEVELOPERS.rst
+++ b/DEVELOPERS.rst
@@ -1,6 +1,6 @@
 To run the tests, use `py.test <http://pytest.org/latest/>`_::
 
-    py.test
+    py.test tests
 
 The tests are all located in the tests/ directory. To add a new unit
 test all you have to do is create the file in the tests/ directory with a
diff --git a/pexpect/__init__.py b/pexpect/__init__.py
index 468c4c2..30c6764 100644
--- a/pexpect/__init__.py
+++ b/pexpect/__init__.py
@@ -727,7 +727,7 @@ class spawn(object):
         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 @@ class spawn(object):
             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