Solaris 11, python2.6 fixes in ptyprocess.py

.travis.yml

@@ -1,7 +1,12 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"
+before_script: pip install -rrequirements-testing.txt
 # command to run tests
 script: py.test
+
+# faster builds on travis-ci
+sudo: False

docs/conf.py

@@ -55,7 +55,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = '0.5'
 # The full version, including alpha/beta/rc tags.
 release = version
 

ptyprocess/ptyprocess.py

@@ -68,7 +68,13 @@ def _make_eof_intr():
             # ValueError: I/O operation on closed file
             fd = sys.__stdout__.fileno()
         intr = ord(termios.tcgetattr(fd)[6][VINTR])
-        eof = ord(termios.tcgetattr(fd)[6][VEOF])
+        eof_val = termios.tcgetattr(fd)[6][VEOF]
+        if _is_solaris and isinstance(eof_val, int):
+            # very strange, on Solaris 11.2-provided python2.6,
+            # eof_val is an integer (1), not a string ('\x04').
+            eof = 4
+        else:
+            eof = ord(eof_val)
     except (ImportError, OSError, IOError, ValueError, termios.error):
         # unless the controlling process is also not a terminal,
         # such as cron(1), or when stdin and stdout are both closed.
@@ -263,7 +269,7 @@ def spawn(
                     preexec_fn()
                 except Exception as e:
                     ename = type(e).__name__
-                    tosend = '{}:0:{}'.format(ename, str(e))
+                    tosend = '{0}:0:{1}'.format(ename, str(e))
                     if PY3:
                         tosend = tosend.encode('utf-8')
 
@@ -279,7 +285,7 @@ def spawn(
             except OSError as err:
                 # [issue #119] 5. If exec fails, the child writes the error
                 # code back to the parent using the pipe, then exits.
-                tosend = 'OSError:{}:{}'.format(err.errno, str(err))
+                tosend = 'OSError:{0}:{1}'.format(err.errno, str(err))
                 if PY3:
                     tosend = tosend.encode('utf-8')
                 os.write(exec_err_pipe_write, tosend)
@@ -325,7 +331,7 @@ def spawn(
         try:
             inst.setwinsize(*dimensions)
         except IOError as err:
-            if err.args[0] not in (errno.EINVAL, errno.ENOTTY):
+            if err.args[0] not in (errno.EINVAL, errno.ENOTTY, errno.ENXIO):
                 raise
 
         return inst
@@ -339,10 +345,10 @@ def __repr__(self):
             if self.launch_dir is not None:
                 args.append("cwd=%r" % self.launch_dir)
 
-            return "{}.spawn({})".format(clsname, ", ".join(args))
+            return "{0}.spawn({1})".format(clsname, ", ".join(args))
 
         else:
-            return "{}(pid={}, fd={})".format(clsname, self.pid, self.fd)
+            return "{0}(pid={1}, fd={2})".format(clsname, self.pid, self.fd)
 
     @staticmethod
     def _coerce_send_string(s):

requirements-testing.txt

@@ -0,0 +1,3 @@
+# unittest2 is a backport of the new features in Python 2.7 and onwards.
+# we use this for python2.6, such as "with self.assertRaises(..)"
+unittest2

setup.py

@@ -6,7 +6,7 @@
     readme = f.read()
 
 setup(name='ptyprocess',
-      version='0.4',
+      version='0.5',
       description="Run a subprocess in a pseudo terminal",
       long_description=readme,
       author='Thomas Kluyver',
@@ -26,4 +26,4 @@
         'Programming Language :: Python :: 3',
         'Topic :: Terminals',
     ],
-)
+)

tests/test_invalid_binary.py

@@ -19,14 +19,14 @@
 
 '''
 import time
-import unittest
+import unittest, unittest2
 from ptyprocess import PtyProcess, PtyProcessUnicode
 import errno
 import os
 import stat
 import tempfile
 
-class InvalidBinaryChars(unittest.TestCase):
+class InvalidBinaryChars(unittest2.TestCase):
 
     def test_invalid_binary(self):
         '''This tests that we correctly handle the case where we attempt to
@@ -67,8 +67,8 @@ def test_invalid_binary(self):
             os.unlink(fullpath)
             os.rmdir(dirpath)
 
+
 if __name__ == '__main__':
     unittest.main()
 
 suite = unittest.makeSuite(InvalidBinaryChars,'test')
-

tests/test_preexec_fn.py

@@ -18,13 +18,21 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 '''
-import unittest
+import unittest, unittest2
 import shutil
 from ptyprocess import PtyProcess
 import os
 import tempfile
 
-class PreexecFns(unittest.TestCase):
+class PreexecFns(unittest2.TestCase):
+    def setUp(self):
+        self.pid = os.getpid()
+
+    def tearDown(self):
+        if self.pid != os.getpid():
+            sys.stderr.write('\nERROR: Test runner has forked! Exiting!\n')
+            os._exit(1)
+
     def test_preexec(self):
         td = tempfile.mkdtemp()
         filepath = os.path.join(td, 'foo')
@@ -56,3 +64,7 @@ def func():
                 raise
 
 
+if __name__ == '__main__':
+    unittest.main()
+
+suite = unittest.makeSuite(PreexecFns, 'test')

tests/test_spawn.py

@@ -1,9 +1,10 @@
+#!/usr/bin/env python
 import os
 import time
-import unittest
+import unittest, unittest2
 from ptyprocess import PtyProcess, PtyProcessUnicode
 
-class PtyTestCase(unittest.TestCase):
+class PtyTestCase(unittest2.TestCase):
     def test_spawn_sh(self):
         env = os.environ.copy()
         env['FOO'] = 'rebar'
@@ -35,3 +36,15 @@ def test_spawn_unicode_sh(self):
 
         with self.assertRaises(EOFError):
             p.read()
+
+    def test_quick_spawn(self):
+        """Spawn a very short-lived process."""
+        # so far only reproducable on Solaris 11, spawning a process
+        # that exits very quickly raised an exception at 'inst.setwinsize',
+        # because the pty filedes was quickly lost after exec().
+        PtyProcess.spawn(['/bin/true'])
+
+if __name__ == '__main__':
+    unittest.main()
+
+suite = unittest.makeSuite(PtyTestCase, 'test')