[Jython-checkins] jython: commit-subprocess.txt

[jim.baker]

https://hg.python.org/jython/rev/99026396b6c2
changeset:   7934:99026396b6c2
user:        Jim Baker <jim.baker at rackspace.com>
date:        Wed Aug 24 18:58:10 2016 -0400
summary:
  commit-subprocess.txt

files:
  ACKNOWLEDGMENTS   |   1 +
  Lib/subprocess.py |  14 +++++++-------
  2 files changed, 8 insertions(+), 7 deletions(-)


diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS
--- a/ACKNOWLEDGMENTS
+++ b/ACKNOWLEDGMENTS
@@ -175,6 +175,7 @@
     Jaime Saiz
     Nick Bailey
     Doug Clayton
+    Carl Wicklow
 
 Local Variables:
 mode: indented-text
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1426,13 +1426,13 @@
             attribute."""
             if self.returncode is None:
                 self.returncode = self._process.waitFor()
-                for coupler in (self._stdout_thread, self._stderr_thread):
-                    if coupler:
-                        coupler.join()
-                if self._stdin_thread:
-                    # The stdin thread may be blocked forever, forcibly
-                    # stop it
-                    self._stdin_thread.interrupt()
+            for coupler in (self._stdout_thread, self._stderr_thread):
+                if coupler:
+                    coupler.join()
+            if self._stdin_thread:
+                # The stdin thread may be blocked forever, forcibly
+                # stop it
+                self._stdin_thread.interrupt()
             return self.returncode
 
         def terminate(self):

-- 
Repository URL: https://hg.python.org/jython