Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f8e0a88a
Commit
f8e0a88a
authored
Aug 02, 2011
by
Ned Deily
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #12540: Prevent zombie IDLE processes on Windows due to changes
in os.kill(). Original patch by Eli Bendersky.
parent
c5ef1fc7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
26 deletions
+18
-26
Lib/idlelib/PyShell.py
Lib/idlelib/PyShell.py
+15
-26
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/idlelib/PyShell.py
View file @
f8e0a88a
...
...
@@ -10,6 +10,7 @@ import time
import
threading
import
traceback
import
types
import
subprocess
import
linecache
from
code
import
InteractiveInterpreter
...
...
@@ -37,11 +38,6 @@ from idlelib import macosxSupport
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 @@ class ModifiedInterpreter(InteractiveInterpreter):
self
.
port
=
PORT
rpcclt
=
None
rpc
pid
=
None
rpc
subproc
=
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 @@ class ModifiedInterpreter(InteractiveInterpreter):
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 @@ class ModifiedInterpreter(InteractiveInterpreter):
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,21 +459,20 @@ class ModifiedInterpreter(InteractiveInterpreter):
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
:
os
.
kill
(
self
.
rpcpid
,
SIGTERM
)
self
.
rpcsubproc
.
kill
(
)
except
OSError
:
# process already terminated:
# process already terminated
return
else
:
try
:
os
.
waitpid
(
self
.
rpcpid
,
0
)
self
.
rpcsubproc
.
wait
(
)
except
OSError
:
return
...
...
Misc/NEWS
View file @
f8e0a88a
...
...
@@ -41,6 +41,9 @@ Core and Builtins
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).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment