Merge branch 'release-1.12.3'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.12.3 - 11/29/16
+
+*   fd leak regression and fix for flawed fd leak detection test [#337](https://github.com/amoffat/sh/pull/337)
+
 ## 1.12.2 - 11/28/16
 
 *   support for `io.StringIO` in python2

setup.py

@@ -46,6 +46,7 @@ def read(*parts):
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Build Tools",

sh.py

@@ -24,7 +24,7 @@
 #===============================================================================
 
 
-__version__ = "1.12.2"
+__version__ = "1.12.3"
 __project_url__ = "https://github.com/amoffat/sh"
 
 
@@ -1786,6 +1786,7 @@ def __init__(self, command, parent_log, cmd, stdin, stdout, stderr,
             os.close(session_pipe_write)
             sid, pgid = os.read(session_pipe_read,
                     1024).decode(DEFAULT_ENCODING).split(",")
+            os.close(session_pipe_read)
             self.sid = int(sid)
             self.pgid = int(pgid)
 

test.py

@@ -2545,6 +2545,7 @@ def get_opts(possible_values):
         def get_num_fds():
             lines = sh.lsof(p=test_pid).strip().split("\n")
             def test(line):
+                line = line.upper()
                 return "CHR" in line or "PIPE" in line
 
             lines = [line for line in lines if test(line)]