From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 24 Dec 2012 18:06:35 +0000 (+0200)
Subject: Keep ref to ECHILD in local scope (#16650)
X-Git-Tag: v3.3.1rc1~489^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08bab072917c2eeea3a0f3da0546d57cf5072bcf;p=thirdparty%2FPython%2Fcpython.git

Keep ref to ECHILD in local scope (#16650)
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index a3228294693b..f32f081e97da 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1411,7 +1411,7 @@ class Popen(object):
 
 
         def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,
-                _WNOHANG=os.WNOHANG, _os_error=os.error):
+                _WNOHANG=os.WNOHANG, _os_error=os.error, _ECHILD=errno.ECHILD):
             """Check if child process has terminated.  Returns returncode
             attribute.
 
@@ -1427,7 +1427,7 @@ class Popen(object):
                 except _os_error as e:
                     if _deadstate is not None:
                         self.returncode = _deadstate
-                    elif e.errno == errno.ECHILD:
+                    elif e.errno == _ECHILD:
                         # This happens if SIGCLD is set to be ignored or
                         # waiting for child processes has otherwise been
                         # disabled for our process.  This child is dead, we