Merge 3.6

This commit is contained in:
Victor Stinner 2017-01-06 10:49:32 +01:00
commit 1459ca64fc

View file

@ -750,15 +750,15 @@ class Popen(object):
# Wait for the process to terminate, to avoid zombies.
self.wait()
def __del__(self, _maxsize=sys.maxsize):
def __del__(self, _maxsize=sys.maxsize, _warn=warnings.warn):
if not self._child_created:
# We didn't get to successfully create a child process.
return
if self.returncode is None:
# Not reading subprocess exit status creates a zombi process which
# is only destroyed at the parent python process exit
warnings.warn("subprocess %s is still running" % self.pid,
ResourceWarning, source=self)
_warn("subprocess %s is still running" % self.pid,
ResourceWarning, source=self)
# In case the child hasn't been waited on, check if it's done.
self._internal_poll(_deadstate=_maxsize)
if self.returncode is None and _active is not None: