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
036e8492
Commit
036e8492
authored
Jun 11, 2013
by
Roger Serwy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#5492: Avoid traceback when exiting IDLE caused by a race condition.
parent
38861204
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
Lib/idlelib/PyShell.py
Lib/idlelib/PyShell.py
+5
-6
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/idlelib/PyShell.py
View file @
036e8492
...
...
@@ -367,6 +367,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
self
.
port
=
PORT
self
.
original_compiler_flags
=
self
.
compile
.
compiler
.
flags
_afterid
=
None
rpcclt
=
None
rpcsubproc
=
None
...
...
@@ -486,6 +487,8 @@ class ModifiedInterpreter(InteractiveInterpreter):
threading
.
Thread
(
target
=
self
.
__request_interrupt
).
start
()
def
kill_subprocess
(
self
):
if
self
.
_afterid
is
not
None
:
self
.
tkconsole
.
text
.
after_cancel
(
self
.
_afterid
)
try
:
self
.
rpcclt
.
listening_sock
.
close
()
except
AttributeError
:
# no socket
...
...
@@ -561,8 +564,8 @@ class ModifiedInterpreter(InteractiveInterpreter):
pass
# Reschedule myself
if
not
self
.
tkconsole
.
closing
:
self
.
tkconsole
.
text
.
after
(
self
.
tkconsole
.
pollinterval
,
self
.
poll_subprocess
)
self
.
_afterid
=
self
.
tkconsole
.
text
.
after
(
self
.
tkconsole
.
pollinterval
,
self
.
poll_subprocess
)
debugger
=
None
...
...
@@ -973,10 +976,6 @@ class PyShell(OutputWindow):
self
.
stop_readline
()
self
.
canceled
=
True
self
.
closing
=
True
# Wait for poll_subprocess() rescheduling to stop
self
.
text
.
after
(
2
*
self
.
pollinterval
,
self
.
close2
)
def
close2
(
self
):
return
EditorWindow
.
close
(
self
)
def
_close
(
self
):
...
...
Misc/NEWS
View file @
036e8492
...
...
@@ -81,6 +81,8 @@ Library
IDLE
----
-
Issue
#
5492
:
Avoid
traceback
when
exiting
IDLE
caused
by
a
race
condition
.
-
Issue
#
17511
:
Keep
IDLE
find
dialog
open
after
clicking
"Find Next"
.
Original
patch
by
Sarah
K
.
...
...
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