diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2006-08-16 05:01:42 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2006-08-16 05:01:42 (GMT) |
| commit | d112bc7958151fa17c4ccb27413c43e45b8476fb (patch) | |
| tree | c6609e3b6f1dcbac565dee44039dfc1f0aec4752 /Lib/idlelib/PyShell.py | |
| parent | 798ed8f0764379d285779a4966a1fee6db61e293 (diff) | |
| download | cpython-d112bc7958151fa17c4ccb27413c43e45b8476fb.zip cpython-d112bc7958151fa17c4ccb27413c43e45b8476fb.tar.gz cpython-d112bc7958151fa17c4ccb27413c43e45b8476fb.tar.bz2 | |
Patch #1540892: site.py Quitter() class attempts to close sys.stdin
before raising SystemExit, allowing IDLE to honor quit() and exit().
M Lib/site.py
M Lib/idlelib/PyShell.py
M Lib/idlelib/CREDITS.txt
M Lib/idlelib/NEWS.txt
M Misc/NEWS
Diffstat (limited to 'Lib/idlelib/PyShell.py')
| -rw-r--r-- | Lib/idlelib/PyShell.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 12a45a4..5790483 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -478,9 +478,6 @@ class ModifiedInterpreter(InteractiveInterpreter): import sys as _sys _sys.path = %r del _sys - _msg = 'Use File/Exit or your end-of-file key to quit IDLE' - __builtins__.quit = __builtins__.exit = _msg - del _msg \n""" % (sys.path,)) active_seq = None @@ -514,7 +511,10 @@ class ModifiedInterpreter(InteractiveInterpreter): print >>sys.__stderr__, errmsg, what print >>console, errmsg, what # we received a response to the currently active seq number: - self.tkconsole.endexecuting() + try: + self.tkconsole.endexecuting() + except AttributeError: # shell may have closed + pass # Reschedule myself if not self.tkconsole.closing: self.tkconsole.text.after(self.tkconsole.pollinterval, @@ -730,7 +730,10 @@ class ModifiedInterpreter(InteractiveInterpreter): self.tkconsole.endexecuting() finally: if not use_subprocess: - self.tkconsole.endexecuting() + try: + self.tkconsole.endexecuting() + except AttributeError: # shell may have closed + pass def write(self, s): "Override base class method" @@ -804,9 +807,6 @@ class PyShell(OutputWindow): # OutputWindow.__init__(self, flist, None, None) # - import __builtin__ - __builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D." - # ## self.config(usetabs=1, indentwidth=8, context_use_ps1=1) self.usetabs = True # indentwidth must be 8 when using tabs. See note in EditorWindow: |