[Python-checkins] cpython (3.2): Issue #12540: Prevent zombie IDLE processes on Windows due to changes

Fri Aug 5 08:39:18 CEST 2011

http://hg.python.org/cpython/rev/cc86f4ca5020
changeset: 71746:cc86f4ca5020
branch: 3.2
parent: 71740:8a0f2887c6b7
user: Ned Deily <nad at acm.org>
date: Tue Aug 02 18:47:13 2011 -0700
summary:
 Issue #12540: Prevent zombie IDLE processes on Windows due to changes
in os.kill(). Original patch by Eli Bendersky.
files:
 Lib/idlelib/PyShell.py | 41 ++++++++++-------------------
 Misc/NEWS | 3 ++
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -10,6 +10,7 @@
 import threading
 import traceback
 import types
+import subprocess
 
 import linecache
 from code import InteractiveInterpreter
@@ -37,11 +38,6 @@
 HOST = '127.0.0.1' # python execution server on localhost loopback
 PORT = 0 # someday pass in host, port for remote debug capability
 
-try:
- from signal import SIGTERM
-except ImportError:
- SIGTERM = 15
-
 # Override warnings module to write to warning_stream. Initialize to send IDLE
 # internal warnings to the console. ScriptBinding.check_syntax() will
 # temporarily redirect the stream to the shell window to display warnings when
@@ -344,13 +340,12 @@
 self.port = PORT
 
 rpcclt = None
- rpcpid = None
+ rpcsubproc = None
 
 def spawn_subprocess(self):
 if self.subprocess_arglist is None:
 self.subprocess_arglist = self.build_subprocess_arglist()
- args = self.subprocess_arglist
- self.rpcpid = os.spawnv(os.P_NOWAIT, sys.executable, args)
+ self.rpcsubproc = subprocess.Popen(self.subprocess_arglist)
 
 def build_subprocess_arglist(self):
 assert (self.port!=0), (
@@ -365,12 +360,7 @@
 command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
 else:
 command = "__import__('run').main(%r)" % (del_exitf,)
- if sys.platform[:3] == 'win' and ' ' in sys.executable:
- # handle embedded space in path by quoting the argument
- decorated_exec = '"%s"' % sys.executable
- else:
- decorated_exec = sys.executable
- return [decorated_exec] + w + ["-c", command, str(self.port)]
+ return [sys.executable] + w + ["-c", command, str(self.port)]
 
 def start_subprocess(self):
 addr = (HOST, self.port)
@@ -428,7 +418,7 @@
 pass
 # Kill subprocess, spawn a new one, accept connection.
 self.rpcclt.close()
- self.unix_terminate()
+ self.terminate_subprocess()
 console = self.tkconsole
 was_executing = console.executing
 console.executing = False
@@ -469,23 +459,22 @@
 self.rpcclt.close()
 except AttributeError: # no socket
 pass
- self.unix_terminate()
+ self.terminate_subprocess()
 self.tkconsole.executing = False
 self.rpcclt = None
 
- def unix_terminate(self):
- "UNIX: make sure subprocess is terminated and collect status"
- if hasattr(os, 'kill'):
+ def terminate_subprocess(self):
+ "Make sure subprocess is terminated"
+ try:
+ self.rpcsubproc.kill()
+ except OSError:
+ # process already terminated
+ return
+ else:
 try:
- os.kill(self.rpcpid, SIGTERM)
+ self.rpcsubproc.wait()
 except OSError:
- # process already terminated:
 return
- else:
- try:
- os.waitpid(self.rpcpid, 0)
- except OSError:
- return
 
 def transfer_path(self):
 self.runcommand("""if 1:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,9 @@
 Library
 -------
 
+- Issue #12540: Prevent zombie IDLE processes on Windows due to changes
+ in os.kill().
+
 - Issue #12683: urlparse updated to include svn as schemes that uses relative
 paths. (svn from 1.5 onwards support relative path).
 
-- 
Repository URL: http://hg.python.org/cpython
