cpython-lru_cache-weakref: Lib/idlelib/PyShell.py annotate

annotate Lib/idlelib/PyShell.py @ 42324:4bbbe0c55fa2

Merged revisions 56443-56466 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56454 | kurt.kaiser | 2007-07-18 22:26:14 -0700 (Wed, 18 Jul 2007) | 2 lines Make relative imports explicit for py3k ................ r56455 | kurt.kaiser | 2007-07-18 23:12:15 -0700 (Wed, 18 Jul 2007) | 2 lines Was modifying dict during iteration. ................ r56457 | guido.van.rossum | 2007-07-19 07:33:19 -0700 (Thu, 19 Jul 2007) | 2 lines Fix failing test. ................ r56466 | guido.van.rossum | 2007-07-19 20:58:16 -0700 (Thu, 19 Jul 2007) | 35 lines Merged revisions 56413-56465 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines Use "Unix" as platform name, not "UNIX". ........ r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. (Slightly tweaked for style and refcounts.) ........ r56444 | kurt.kaiser | 2007-07-18 12:58:42 -0700 (Wed, 18 Jul 2007) | 2 lines Fix failing unicode test caused by change to ast.c at r56441 ........ r56451 | georg.brandl | 2007-07-18 15:36:53 -0700 (Wed, 18 Jul 2007) | 2 lines Add description for wave.setcomptype() values ........ r56456 | walter.doerwald | 2007-07-19 06:04:38 -0700 (Thu, 19 Jul 2007) | 3 lines Document that codecs.lookup() returns a CodecInfo object. (fixes SF bug #1754453). ........ r56463 | facundo.batista | 2007-07-19 16:57:38 -0700 (Thu, 19 Jul 2007) | 6 lines Added a select.select call in the test server loop to make sure the socket is ready to be read from before attempting a read (this prevents an error 10035 on some Windows platforms). [GSoC - Alan McIntyre] ........ ................

author	Guido van Rossum <guido@python.org>
date	Fri, 20 Jul 2007 04:05:57 +0000
parents	bd6acfdb47d2
children	dd74e020a132

rev	line source
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1 #! /usr/bin/env python
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	2
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	3 import os
26468 fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	4 import os.path
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	5 import sys
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	6 import string
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	7 import getopt
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	8 import re
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	9 import socket
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	10 import time
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	11 import threading
25322 7de88cf0783e Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25310 diff changeset	12 import traceback
7de88cf0783e Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25310 diff changeset	13 import types
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	14
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	15 import linecache
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	16 from code import InteractiveInterpreter
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	17
31013 270d59e346e6 Keybindings with the Shift modifier now work correctly. So do bindings Kurt B. Kaiser <kbk@shore.net> parents: 30142 diff changeset	18 try:
270d59e346e6 Keybindings with the Shift modifier now work correctly. So do bindings Kurt B. Kaiser <kbk@shore.net> parents: 30142 diff changeset	19 from Tkinter import *
270d59e346e6 Keybindings with the Shift modifier now work correctly. So do bindings Kurt B. Kaiser <kbk@shore.net> parents: 30142 diff changeset	20 except ImportError:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	21 print("** IDLE can't import Tkinter. " \
4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	22 "Your Python may not be configured for Tk. **", file=sys.__stderr__)
31013 270d59e346e6 Keybindings with the Shift modifier now work correctly. So do bindings Kurt B. Kaiser <kbk@shore.net> parents: 30142 diff changeset	23 sys.exit(1)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	24 import tkMessageBox
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	25
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	26 from .EditorWindow import EditorWindow, fixwordbreaks
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	27 from .FileList import FileList
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	28 from .ColorDelegator import ColorDelegator
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	29 from .UndoDelegator import UndoDelegator
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	30 from .OutputWindow import OutputWindow
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	31 from .configHandler import idleConf
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	32 from . import idlever
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	33 from . import rpc
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	34 from . import Debugger
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	35 from . import RemoteDebugger
4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	36 from . import macosxSupport
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	37
25346 6dec74f44242 Fix bug I created during merge from Python-idle. Kurt B. Kaiser <kbk@shore.net> parents: 25322 diff changeset	38 IDENTCHARS = string.ascii_letters + string.digits + "_"
29365 72ce7cc03f27 Avoid problem resolving 'localhost' Kurt B. Kaiser <kbk@shore.net> parents: 29353 diff changeset	39 LOCALHOST = '127.0.0.1'
25346 6dec74f44242 Fix bug I created during merge from Python-idle. Kurt B. Kaiser <kbk@shore.net> parents: 25322 diff changeset	40
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	41 try:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	42 from signal import SIGTERM
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	43 except ImportError:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	44 SIGTERM = 15
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	45
32484 f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	46 # Override warnings module to write to warning_stream. Initialize to send IDLE
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	47 # internal warnings to the console. ScriptBinding.check_syntax() will
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	48 # temporarily redirect the stream to the shell window to display warnings when
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	49 # checking user's code.
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	50 global warning_stream
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	51 warning_stream = sys.__stderr__
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	52 try:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	53 import warnings
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	54 except ImportError:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	55 pass
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	56 else:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	57 def idle_showwarning(message, category, filename, lineno):
32484 f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	58 file = warning_stream
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	59 try:
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	60 file.write(warnings.formatwarning(message, category, filename, lineno))
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	61 except IOError:
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	62 pass ## file (probably __stderr__) is invalid, warning dropped.
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	63 warnings.showwarning = idle_showwarning
32484 f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	64 def idle_formatwarning(message, category, filename, lineno):
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	65 """Format warnings the IDLE way"""
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	66 s = "\nWarning (from warnings module):\n"
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	67 s += ' File \"%s\", line %s\n' % (filename, lineno)
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	68 line = linecache.getline(filename, lineno).strip()
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	69 if line:
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	70 s += " %s\n" % line
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	71 s += "%s: %s\n>>> " % (category.__name__, message)
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	72 return s
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	73 warnings.formatwarning = idle_formatwarning
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	74
33989 4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	75 def extended_linecache_checkcache(filename=None,
4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	76 orig_checkcache=linecache.checkcache):
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	77 """Extend linecache.checkcache to preserve the <pyshell#...> entries
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	78
33989 4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	79 Rather than repeating the linecache code, patch it to save the
4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	80 <pyshell#...> entries, call the original linecache.checkcache()
4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	81 (which destroys them), and then restore the saved entries.
4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	82
4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	83 orig_checkcache is bound at definition time to the original
4f2bbd471a21 The change in the linecache.checkcache() signature at rev 1.13 caused IDLE to exit Kurt B. Kaiser <kbk@shore.net> parents: 33218 diff changeset	84 method, allowing it to be patched.
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	85
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	86 """
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	87 cache = linecache.cache
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	88 save = {}
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	89 for filename in cache.keys():
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	90 if filename[:1] + filename[-1:] == '<>':
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	91 save[filename] = cache[filename]
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	92 orig_checkcache()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	93 cache.update(save)
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	94
26463 c88f6fff1c3f Correct an error introduced at Rev 1.30. The keyword arg is necessary Kurt B. Kaiser <kbk@shore.net> parents: 26028 diff changeset	95 # Patch linecache.checkcache():
c88f6fff1c3f Correct an error introduced at Rev 1.30. The keyword arg is necessary Kurt B. Kaiser <kbk@shore.net> parents: 26028 diff changeset	96 linecache.checkcache = extended_linecache_checkcache
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	97
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	98
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	99 class PyShellEditorWindow(EditorWindow):
33218 066c7890cd61 1. If user passes a non-existant filename on the commandline, just open Kurt B. Kaiser <kbk@shore.net> parents: 32512 diff changeset	100 "Regular text edit window in IDLE, supports breakpoints"
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	101
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	102 def __init__(self, *args):
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	103 self.breakpoints = []
29794 94e5d1b8f696 SF patch #768187: replace apply(f, args, kwds) with f(args, kwds) Raymond Hettinger <python@rcn.com>* parents: 29788 diff changeset	104 EditorWindow.__init__(self, *args)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	105 self.text.bind("<<set-breakpoint-here>>", self.set_breakpoint_here)
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	106 self.text.bind("<<clear-breakpoint-here>>", self.clear_breakpoint_here)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	107 self.text.bind("<<open-python-shell>>", self.flist.open_shell)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	108
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	109 self.breakpointPath = os.path.join(idleConf.GetUserCfgDir(),
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	110 'breakpoints.lst')
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	111 # whenever a file is changed, restore breakpoints
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	112 if self.io.filename: self.restore_file_breaks()
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	113 def filename_changed_hook(old_hook=self.io.filename_change_hook,
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	114 self=self):
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	115 self.restore_file_breaks()
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	116 old_hook()
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	117 self.io.set_filename_change_hook(filename_changed_hook)
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	118
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	119 rmenu_specs = [("Set Breakpoint", "<<set-breakpoint-here>>"),
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	120 ("Clear Breakpoint", "<<clear-breakpoint-here>>")]
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	121
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	122 def set_breakpoint(self, lineno):
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	123 text = self.text
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	124 filename = self.io.filename
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	125 text.tag_add("BREAK", "%d.0" % lineno, "%d.0" % (lineno+1))
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	126 try:
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	127 i = self.breakpoints.index(lineno)
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	128 except ValueError: # only add if missing, i.e. do once
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	129 self.breakpoints.append(lineno)
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	130 try: # update the subprocess debugger
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	131 debug = self.flist.pyshell.interp.debugger
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	132 debug.set_breakpoint_here(filename, lineno)
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	133 except: # but debugger may not be active right now....
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	134 pass
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	135
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	136 def set_breakpoint_here(self, event=None):
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	137 text = self.text
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	138 filename = self.io.filename
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	139 if not filename:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	140 text.bell()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	141 return
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	142 lineno = int(float(text.index("insert")))
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	143 self.set_breakpoint(lineno)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	144
23932 eab8eca9ec51 1. Debugger Breakpoints, finish implementation Kurt B. Kaiser <kbk@shore.net> parents: 23876 diff changeset	145 def clear_breakpoint_here(self, event=None):
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	146 text = self.text
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	147 filename = self.io.filename
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	148 if not filename:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	149 text.bell()
23932 eab8eca9ec51 1. Debugger Breakpoints, finish implementation Kurt B. Kaiser <kbk@shore.net> parents: 23876 diff changeset	150 return
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	151 lineno = int(float(text.index("insert")))
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	152 try:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	153 self.breakpoints.remove(lineno)
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	154 except:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	155 pass
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	156 text.tag_remove("BREAK", "insert linestart",\
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	157 "insert lineend +1char")
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	158 try:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	159 debug = self.flist.pyshell.interp.debugger
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	160 debug.clear_breakpoint_here(filename, lineno)
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	161 except:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	162 pass
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	163
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	164 def clear_file_breaks(self):
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	165 if self.breakpoints:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	166 text = self.text
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	167 filename = self.io.filename
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	168 if not filename:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	169 text.bell()
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	170 return
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	171 self.breakpoints = []
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	172 text.tag_remove("BREAK", "1.0", END)
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	173 try:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	174 debug = self.flist.pyshell.interp.debugger
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	175 debug.clear_file_breaks(filename)
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	176 except:
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	177 pass
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	178
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	179 def store_file_breaks(self):
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	180 "Save breakpoints when file is saved"
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	181 # XXX 13 Dec 2002 KBK Currently the file must be saved before it can
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	182 # be run. The breaks are saved at that time. If we introduce
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	183 # a temporary file save feature the save breaks functionality
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	184 # needs to be re-verified, since the breaks at the time the
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	185 # temp file is created may differ from the breaks at the last
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	186 # permanent save of the file. Currently, a break introduced
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	187 # after a save will be effective, but not persistent.
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	188 # This is necessary to keep the saved breaks synched with the
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	189 # saved file.
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	190 #
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	191 # Breakpoints are set as tagged ranges in the text. Certain
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	192 # kinds of edits cause these ranges to be deleted: Inserting
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	193 # or deleting a line just before a breakpoint, and certain
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	194 # deletions prior to a breakpoint. These issues need to be
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	195 # investigated and understood. It's not clear if they are
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	196 # Tk issues or IDLE issues, or whether they can actually
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	197 # be fixed. Since a modified file has to be saved before it is
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	198 # run, and since self.breakpoints (from which the subprocess
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	199 # debugger is loaded) is updated during the save, the visible
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	200 # breaks stay synched with the subprocess even if one of these
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	201 # unexpected breakpoint deletions occurs.
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	202 breaks = self.breakpoints
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	203 filename = self.io.filename
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	204 try:
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	205 lines = open(self.breakpointPath,"r").readlines()
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	206 except IOError:
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	207 lines = []
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	208 new_file = open(self.breakpointPath,"w")
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	209 for line in lines:
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	210 if not line.startswith(filename + '='):
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	211 new_file.write(line)
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	212 self.update_breakpoints()
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	213 breaks = self.breakpoints
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	214 if breaks:
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	215 new_file.write(filename + '=' + str(breaks) + '\n')
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	216 new_file.close()
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	217
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	218 def restore_file_breaks(self):
18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	219 self.text.update() # this enables setting "BREAK" tags to be visible
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	220 filename = self.io.filename
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	221 if filename is None:
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	222 return
26028 64a96b97e1e9 Set breakpoints on remote debugger Chui Tey <chui.tey@advdata.com.au> parents: 26025 diff changeset	223 if os.path.isfile(self.breakpointPath):
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	224 lines = open(self.breakpointPath,"r").readlines()
26028 64a96b97e1e9 Set breakpoints on remote debugger Chui Tey <chui.tey@advdata.com.au> parents: 26025 diff changeset	225 for line in lines:
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	226 if line.startswith(filename + '='):
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	227 breakpoint_linenumbers = eval(line[len(filename)+1:])
26028 64a96b97e1e9 Set breakpoints on remote debugger Chui Tey <chui.tey@advdata.com.au> parents: 26025 diff changeset	228 for breakpoint_linenumber in breakpoint_linenumbers:
64a96b97e1e9 Set breakpoints on remote debugger Chui Tey <chui.tey@advdata.com.au> parents: 26025 diff changeset	229 self.set_breakpoint(breakpoint_linenumber)
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	230
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	231 def update_breakpoints(self):
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	232 "Retrieves all the breakpoints in the current window"
26025 18e09720738f Recalls breakpoints set in a file Chui Tey <chui.tey@advdata.com.au> parents: 25894 diff changeset	233 text = self.text
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	234 ranges = text.tag_ranges("BREAK")
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	235 linenumber_list = self.ranges_to_linenumbers(ranges)
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	236 self.breakpoints = linenumber_list
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	237
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	238 def ranges_to_linenumbers(self, ranges):
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	239 lines = []
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	240 for index in range(0, len(ranges), 2):
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	241 lineno = int(float(ranges[index]))
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	242 end = int(float(ranges[index+1]))
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	243 while lineno < end:
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	244 lines.append(lineno)
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	245 lineno += 1
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	246 return lines
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	247
26771 fc7fdec3fb86 1. RPC stack levels were not pruned from traceback unless IDLE was started Kurt B. Kaiser <kbk@shore.net> parents: 26758 diff changeset	248 # XXX 13 Dec 2002 KBK Not used currently
26659 d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	249 # def saved_change_hook(self):
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	250 # "Extend base method - clear breaks if module is modified"
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	251 # if not self.get_saved():
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	252 # self.clear_file_breaks()
d99e38bb6dcd M Debugger.py Kurt B. Kaiser <kbk@shore.net> parents: 26590 diff changeset	253 # EditorWindow.saved_change_hook(self)
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	254
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	255 def _close(self):
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	256 "Extend base method - clear breaks when module is closed"
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	257 self.clear_file_breaks()
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	258 EditorWindow._close(self)
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	259
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	260
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	261 class PyShellFileList(FileList):
33218 066c7890cd61 1. If user passes a non-existant filename on the commandline, just open Kurt B. Kaiser <kbk@shore.net> parents: 32512 diff changeset	262 "Extend base class: IDLE supports a shell and breakpoints"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	263
33218 066c7890cd61 1. If user passes a non-existant filename on the commandline, just open Kurt B. Kaiser <kbk@shore.net> parents: 32512 diff changeset	264 # override FileList's class variable, instances return PyShellEditorWindow
066c7890cd61 1. If user passes a non-existant filename on the commandline, just open Kurt B. Kaiser <kbk@shore.net> parents: 32512 diff changeset	265 # instead of EditorWindow when new edit windows are created.
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	266 EditorWindow = PyShellEditorWindow
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	267
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	268 pyshell = None
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	269
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	270 def open_shell(self, event=None):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	271 if self.pyshell:
33218 066c7890cd61 1. If user passes a non-existant filename on the commandline, just open Kurt B. Kaiser <kbk@shore.net> parents: 32512 diff changeset	272 self.pyshell.top.wakeup()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	273 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	274 self.pyshell = PyShell(self)
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	275 if self.pyshell:
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	276 if not self.pyshell.begin():
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	277 return None
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	278 return self.pyshell
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	279
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	280
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	281 class ModifiedColorDelegator(ColorDelegator):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	282 "Extend base class: colorizer for the shell window itself"
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	283
22111 c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	284 def __init__(self):
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	285 ColorDelegator.__init__(self)
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	286 self.LoadTagDefs()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	287
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	288 def recolorize_main(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	289 self.tag_remove("TODO", "1.0", "iomark")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	290 self.tag_add("SYNC", "1.0", "iomark")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	291 ColorDelegator.recolorize_main(self)
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	292
22111 c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	293 def LoadTagDefs(self):
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	294 ColorDelegator.LoadTagDefs(self)
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	295 theme = idleConf.GetOption('main','Theme','name')
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	296 self.tagdefs.update({
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	297 "stdin": {'background':None,'foreground':None},
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	298 "stdout": idleConf.GetHighlight(theme, "stdout"),
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	299 "stderr": idleConf.GetHighlight(theme, "stderr"),
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	300 "console": idleConf.GetHighlight(theme, "console"),
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	301 None: idleConf.GetHighlight(theme, "normal"),
c494084dc6d8 First work on making config changes dynamic, Steven M. Gava <elguavas@python.net> parents: 21627 diff changeset	302 })
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	303
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	304 class ModifiedUndoDelegator(UndoDelegator):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	305 "Extend base class: forbid insert/delete before the I/O mark"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	306
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	307 def insert(self, index, chars, tags=None):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	308 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	309 if self.delegate.compare(index, "<", "iomark"):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	310 self.delegate.bell()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	311 return
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	312 except TclError:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	313 pass
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	314 UndoDelegator.insert(self, index, chars, tags)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	315
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	316 def delete(self, index1, index2=None):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	317 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	318 if self.delegate.compare(index1, "<", "iomark"):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	319 self.delegate.bell()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	320 return
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	321 except TclError:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	322 pass
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	323 UndoDelegator.delete(self, index1, index2)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	324
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	325
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	326 class MyRPCClient(rpc.RPCClient):
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	327
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	328 def handle_EOF(self):
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	329 "Override the base class - just re-raise EOFError"
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	330 raise EOFError
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	331
29271 8f73df099967 Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 29256 diff changeset	332
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	333 class ModifiedInterpreter(InteractiveInterpreter):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	334
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	335 def __init__(self, tkconsole):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	336 self.tkconsole = tkconsole
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	337 locals = sys.modules['__main__'].__dict__
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	338 InteractiveInterpreter.__init__(self, locals=locals)
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	339 self.save_warnings_filters = None
29256 b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	340 self.restarting = False
29281 4992c60d422b Added a config-main General option to delete sys.exitfunc. The default Kurt B. Kaiser <kbk@shore.net> parents: 29271 diff changeset	341 self.subprocess_arglist = self.build_subprocess_arglist()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	342
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	343 port = 8833
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	344 rpcclt = None
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	345 rpcpid = None
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	346
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	347 def spawn_subprocess(self):
29281 4992c60d422b Added a config-main General option to delete sys.exitfunc. The default Kurt B. Kaiser <kbk@shore.net> parents: 29271 diff changeset	348 args = self.subprocess_arglist
30142 05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	349 self.rpcpid = os.spawnv(os.P_NOWAIT, sys.executable, args)
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	350
26730 9b4c014b3a21 Update way a subprocess is launched for Mac OS X. Tony Lownds <tony@lownds.com> parents: 26693 diff changeset	351 def build_subprocess_arglist(self):
29101 32e70ad79f66 1. The command-line arguments for subprocesses no longer need to be Tony Lownds <tony@lownds.com> parents: 29076 diff changeset	352 w = ['-W' + s for s in sys.warnoptions]
32e70ad79f66 1. The command-line arguments for subprocesses no longer need to be Tony Lownds <tony@lownds.com> parents: 29076 diff changeset	353 # Maybe IDLE is installed and is being accessed via sys.path,
32e70ad79f66 1. The command-line arguments for subprocesses no longer need to be Tony Lownds <tony@lownds.com> parents: 29076 diff changeset	354 # or maybe it's not installed and the idle.py script is being
32e70ad79f66 1. The command-line arguments for subprocesses no longer need to be Tony Lownds <tony@lownds.com> parents: 29076 diff changeset	355 # run from the IDLE source directory.
29281 4992c60d422b Added a config-main General option to delete sys.exitfunc. The default Kurt B. Kaiser <kbk@shore.net> parents: 29271 diff changeset	356 del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc',
4992c60d422b Added a config-main General option to delete sys.exitfunc. The default Kurt B. Kaiser <kbk@shore.net> parents: 29271 diff changeset	357 default=False, type='bool')
29101 32e70ad79f66 1. The command-line arguments for subprocesses no longer need to be Tony Lownds <tony@lownds.com> parents: 29076 diff changeset	358 if __name__ == 'idlelib.PyShell':
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	359 command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
25480 9d50bc831bca Finding a suitable interpreter to spawn needed tweaking on the Mac Tony Lownds <tony@lownds.com> parents: 25346 diff changeset	360 else:
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	361 command = "__import__('run').main(%r)" % (del_exitf,)
30142 05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	362 if sys.platform[:3] == 'win' and ' ' in sys.executable:
05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	363 # handle embedded space in path by quoting the argument
05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	364 decorated_exec = '"%s"' % sys.executable
05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	365 else:
05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	366 decorated_exec = sys.executable
05673b16bdb8 IDLE didn't start correctly when Python was installed in "Program Files" Kurt B. Kaiser <kbk@shore.net> parents: 30001 diff changeset	367 return [decorated_exec] + w + ["-c", command, str(self.port)]
25480 9d50bc831bca Finding a suitable interpreter to spawn needed tweaking on the Mac Tony Lownds <tony@lownds.com> parents: 25346 diff changeset	368
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	369 def start_subprocess(self):
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	370 # spawning first avoids passing a listening socket to the subprocess
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	371 self.spawn_subprocess()
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	372 #time.sleep(20) # test to simulate GUI not accepting connection
29365 72ce7cc03f27 Avoid problem resolving 'localhost' Kurt B. Kaiser <kbk@shore.net> parents: 29353 diff changeset	373 addr = (LOCALHOST, self.port)
24559 f059d5435d65 GvR provided solution to the socket rebinding timeout problem. Kurt B. Kaiser <kbk@shore.net> parents: 24386 diff changeset	374 # Idle starts listening for connection on localhost
29120 addd437be749 1. Make the startup more robust by not spawning the subprocess if IDLE Kurt B. Kaiser <kbk@shore.net> parents: 29119 diff changeset	375 for i in range(3):
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	376 time.sleep(i)
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	377 try:
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	378 self.rpcclt = MyRPCClient(addr)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	379 break
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40450 diff changeset	380 except socket.error as err:
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	381 pass
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	382 else:
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	383 self.display_port_binding_error()
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	384 return None
24386 0e27b67247da Reverse the RPC socket connection: Python execution server connects to Kurt B. Kaiser <kbk@shore.net> parents: 24183 diff changeset	385 # Accept the connection from the Python execution server
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	386 self.rpcclt.listening_sock.settimeout(10)
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	387 try:
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	388 self.rpcclt.accept()
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40450 diff changeset	389 except socket.timeout as err:
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	390 self.display_no_subprocess_error()
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	391 return None
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	392 self.rpcclt.register("stdin", self.tkconsole)
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	393 self.rpcclt.register("stdout", self.tkconsole.stdout)
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	394 self.rpcclt.register("stderr", self.tkconsole.stderr)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	395 self.rpcclt.register("flist", self.tkconsole.flist)
27545 f9822b18cf91 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 27379 diff changeset	396 self.rpcclt.register("linecache", linecache)
29353 b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	397 self.rpcclt.register("interp", self)
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	398 self.transfer_path()
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	399 self.poll_subprocess()
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	400 return self.rpcclt
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	401
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	402 def restart_subprocess(self):
29256 b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	403 if self.restarting:
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	404 return self.rpcclt
29256 b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	405 self.restarting = True
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	406 # close only the subprocess debugger
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	407 debug = self.getdebugger()
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	408 if debug:
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	409 try:
29076 ad84fe58ec2f 1. RemoteDebugger now runs user code in subprocess MainThread Kurt B. Kaiser <kbk@shore.net> parents: 29059 diff changeset	410 # Only close subprocess debugger, don't unregister gui_adap!
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	411 RemoteDebugger.close_subprocess_debugger(self.rpcclt)
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	412 except:
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	413 pass
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	414 # Kill subprocess, spawn a new one, accept connection.
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	415 self.rpcclt.close()
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	416 self.unix_terminate()
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	417 console = self.tkconsole
29256 b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	418 was_executing = console.executing
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	419 console.executing = False
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	420 self.spawn_subprocess()
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	421 try:
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	422 self.rpcclt.accept()
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40450 diff changeset	423 except socket.timeout as err:
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	424 self.display_no_subprocess_error()
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	425 return None
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	426 self.transfer_path()
27074 b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	427 # annotate restart in shell window and mark it
27336 cbca0bcf1c31 M Bindings.py Kurt B. Kaiser <kbk@shore.net> parents: 27074 diff changeset	428 console.text.delete("iomark", "end-1c")
29256 b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	429 if was_executing:
b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	430 console.write('\n')
b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	431 console.showprompt()
27074 b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	432 halfbar = ((int(console.width) - 16) // 2) * '='
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	433 console.write(halfbar + ' RESTART ' + halfbar)
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	434 console.text.mark_set("restart", "end-1c")
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	435 console.text.mark_gravity("restart", "left")
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	436 console.showprompt()
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	437 # restart subprocess debugger
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	438 if debug:
29076 ad84fe58ec2f 1. RemoteDebugger now runs user code in subprocess MainThread Kurt B. Kaiser <kbk@shore.net> parents: 29059 diff changeset	439 # Restarted debugger connects to current instance of debug GUI
25123 6b67d26079f2 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 24559 diff changeset	440 gui = RemoteDebugger.restart_subprocess_debugger(self.rpcclt)
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	441 # reload remote debugger breakpoints for all PyShellEditWindows
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	442 debug.load_breakpoints()
29256 b909fdf0edf8 Improved the RESTART annotation in the shell window when the user Kurt B. Kaiser <kbk@shore.net> parents: 29254 diff changeset	443 self.restarting = False
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	444 return self.rpcclt
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	445
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	446 def __request_interrupt(self):
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	447 self.rpcclt.remotecall("exec", "interrupt_the_server", (), {})
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	448
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	449 def interrupt_subprocess(self):
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	450 threading.Thread(target=self.__request_interrupt).start()
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	451
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	452 def kill_subprocess(self):
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	453 try:
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	454 self.rpcclt.close()
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	455 except AttributeError: # no socket
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	456 pass
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	457 self.unix_terminate()
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	458 self.tkconsole.executing = False
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	459 self.rpcclt = None
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	460
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	461 def unix_terminate(self):
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	462 "UNIX: make sure subprocess is terminated and collect status"
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	463 if hasattr(os, 'kill'):
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	464 try:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	465 os.kill(self.rpcpid, SIGTERM)
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	466 except OSError:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	467 # process already terminated:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	468 return
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	469 else:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	470 try:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	471 os.waitpid(self.rpcpid, 0)
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	472 except OSError:
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	473 return
28385 b23434211d01 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 28266 diff changeset	474
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	475 def transfer_path(self):
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	476 self.runcommand("""if 1:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	477 import sys as _sys
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	478 _sys.path = %r
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	479 del _sys
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	480 \n""" % (sys.path,))
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	481
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	482 active_seq = None
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	483
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	484 def poll_subprocess(self):
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	485 clt = self.rpcclt
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	486 if clt is None:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	487 return
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	488 try:
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	489 response = clt.pollresponse(self.active_seq, wait=0.05)
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	490 except (EOFError, IOError, KeyboardInterrupt):
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	491 # lost connection or subprocess terminated itself, restart
656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	492 # [the KBI is from rpc.SocketIO.handle_EOF()]
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	493 if self.tkconsole.closing:
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	494 return
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	495 response = None
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	496 self.restart_subprocess()
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	497 if response:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	498 self.tkconsole.resetoutput()
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	499 self.active_seq = None
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	500 how, what = response
27379 a457531c0fd4 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 27336 diff changeset	501 console = self.tkconsole.console
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	502 if how == "OK":
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	503 if what is not None:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	504 print(repr(what), file=console)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	505 elif how == "EXCEPTION":
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	506 if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"):
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	507 self.remote_stack_viewer()
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	508 elif how == "ERROR":
26557 4be62dc9a3e7 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26471 diff changeset	509 errmsg = "PyShell.ModifiedInterpreter: Subprocess ERROR:\n"
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	510 print(errmsg, what, file=sys.__stderr__)
4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	511 print(errmsg, what, file=console)
27379 a457531c0fd4 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 27336 diff changeset	512 # we received a response to the currently active seq number:
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	513 try:
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	514 self.tkconsole.endexecuting()
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	515 except AttributeError: # shell may have closed
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	516 pass
29171 9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	517 # Reschedule myself
9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	518 if not self.tkconsole.closing:
9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	519 self.tkconsole.text.after(self.tkconsole.pollinterval,
9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	520 self.poll_subprocess)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	521
25894 19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	522 debugger = None
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	523
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	524 def setdebugger(self, debugger):
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	525 self.debugger = debugger
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	526
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	527 def getdebugger(self):
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	528 return self.debugger
19500c9b58c1 Implement Restoring Breakpoints in Subprocess Debugger Kurt B. Kaiser <kbk@shore.net> parents: 25691 diff changeset	529
29353 b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	530 def open_remote_stack_viewer(self):
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	531 """Initiate the remote stack viewer from a separate thread.
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	532
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	533 This method is called from the subprocess, and by returning from this
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	534 method we allow the subprocess to unblock. After a bit the shell
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	535 requests the subprocess to open the remote stack viewer which returns a
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	536 static object looking at the last exceptiopn. It is queried through
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	537 the RPC mechanism.
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	538
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	539 """
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	540 self.tkconsole.text.after(300, self.remote_stack_viewer)
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	541 return
b1395014714a Modify the remote stack viewer to work in the threaded subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29281 diff changeset	542
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	543 def remote_stack_viewer(self):
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	544 from . import RemoteObjectBrowser
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	545 oid = self.rpcclt.remotequeue("exec", "stackviewer", ("flist",), {})
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	546 if oid is None:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	547 self.tkconsole.root.bell()
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	548 return
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	549 item = RemoteObjectBrowser.StubObjectTreeItem(self.rpcclt, oid)
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	550 from .TreeWidget import ScrolledCanvas, TreeNode
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	551 top = Toplevel(self.tkconsole.root)
31625 1b02c77cdcfe Add a highlight theme for builtin keywords. Python Patch 805830 Nigel Rowe Kurt B. Kaiser <kbk@shore.net> parents: 31515 diff changeset	552 theme = idleConf.GetOption('main','Theme','name')
1b02c77cdcfe Add a highlight theme for builtin keywords. Python Patch 805830 Nigel Rowe Kurt B. Kaiser <kbk@shore.net> parents: 31515 diff changeset	553 background = idleConf.GetHighlight(theme, 'normal')['background']
1b02c77cdcfe Add a highlight theme for builtin keywords. Python Patch 805830 Nigel Rowe Kurt B. Kaiser <kbk@shore.net> parents: 31515 diff changeset	554 sc = ScrolledCanvas(top, bg=background, highlightthickness=0)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	555 sc.frame.pack(expand=1, fill="both")
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	556 node = TreeNode(sc.canvas, None, item)
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	557 node.expand()
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	558 # XXX Should GC the remote tree when closing the window
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	559
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	560 gid = 0
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	561
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	562 def execsource(self, source):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	563 "Like runsource() but assumes complete exec source"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	564 filename = self.stuffsource(source)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	565 self.execfile(filename, source)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	566
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	567 def execfile(self, filename, source=None):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	568 "Execute an existing file"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	569 if source is None:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	570 source = open(filename, "r").read()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	571 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	572 code = compile(source, filename, "exec")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	573 except (OverflowError, SyntaxError):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	574 self.tkconsole.resetoutput()
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	575 tkerr = self.tkconsole.stderr
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	576 print('*** Error in script or command!\n', file=tkerr)
4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	577 print('Traceback (most recent call last):', file=tkerr)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	578 InteractiveInterpreter.showsyntaxerror(self, filename)
26468 fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	579 self.tkconsole.showprompt()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	580 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	581 self.runcode(code)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	582
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	583 def runsource(self, source):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	584 "Extend base class method: Stuff the source in the line cache first"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	585 filename = self.stuffsource(source)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	586 self.more = 0
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	587 self.save_warnings_filters = warnings.filters[:]
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	588 warnings.filterwarnings(action="error", category=SyntaxWarning)
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	589 if isinstance(source, types.UnicodeType):
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	590 from . import IOBinding
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	591 try:
eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	592 source = source.encode(IOBinding.encoding)
eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	593 except UnicodeError:
eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	594 self.tkconsole.resetoutput()
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	595 self.write("Unsupported characters in input\n")
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	596 return
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	597 try:
34948 e4e0cff16bc7 Improve subprocess link error notification Kurt B. Kaiser <kbk@shore.net> parents: 34443 diff changeset	598 # InteractiveInterpreter.runsource() calls its runcode() method,
e4e0cff16bc7 Improve subprocess link error notification Kurt B. Kaiser <kbk@shore.net> parents: 34443 diff changeset	599 # which is overridden (see below)
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	600 return InteractiveInterpreter.runsource(self, source, filename)
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	601 finally:
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	602 if self.save_warnings_filters is not None:
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	603 warnings.filters[:] = self.save_warnings_filters
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	604 self.save_warnings_filters = None
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	605
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	606 def stuffsource(self, source):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	607 "Stuff source in the filename cache"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	608 filename = "<pyshell#%d>" % self.gid
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	609 self.gid = self.gid + 1
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	610 lines = source.split("\n")
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	611 linecache.cache[filename] = len(source)+1, 0, lines, filename
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	612 return filename
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	613
29122 c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	614 def prepend_syspath(self, filename):
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	615 "Prepend sys.path with file's directory if not already included"
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	616 self.runcommand("""if 1:
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	617 _filename = %r
29122 c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	618 import sys as _sys
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	619 from os.path import dirname as _dirname
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	620 _dir = _dirname(_filename)
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	621 if not _dir in _sys.path:
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	622 _sys.path.insert(0, _dir)
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	623 del _filename, _sys, _dirname, _dir
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	624 \n""" % (filename,))
29122 c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	625
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	626 def showsyntaxerror(self, filename=None):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	627 """Extend base class method: Add Colorizing
edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	628
edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	629 Color the offending position instead of printing it and pointing at it
edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	630 with a caret.
edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	631
edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	632 """
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	633 text = self.tkconsole.text
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	634 stuff = self.unpackerror()
26468 fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	635 if stuff:
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	636 msg, lineno, offset, line = stuff
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	637 if lineno == 1:
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	638 pos = "iomark + %d chars" % (offset-1)
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	639 else:
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	640 pos = "iomark linestart + %d lines + %d chars" % \
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	641 (lineno-1, offset-1)
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	642 text.tag_add("ERROR", pos)
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	643 text.see(pos)
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	644 char = text.get(pos)
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	645 if char and char in IDENTCHARS:
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	646 text.tag_add("ERROR", pos + " wordstart", pos)
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	647 self.tkconsole.resetoutput()
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	648 self.write("SyntaxError: %s\n" % str(msg))
fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	649 else:
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	650 self.tkconsole.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	651 InteractiveInterpreter.showsyntaxerror(self, filename)
26468 fbb24cd54766 M PyShell.py Kurt B. Kaiser <kbk@shore.net> parents: 26463 diff changeset	652 self.tkconsole.showprompt()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	653
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	654 def unpackerror(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	655 type, value, tb = sys.exc_info()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	656 ok = type is SyntaxError
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	657 if ok:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	658 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	659 msg, (dummy_filename, lineno, offset, line) = value
29788 9035fe768689 SF Bug 767794 Kurt B. Kaiser <kbk@shore.net> parents: 29582 diff changeset	660 if not offset:
9035fe768689 SF Bug 767794 Kurt B. Kaiser <kbk@shore.net> parents: 29582 diff changeset	661 offset = 0
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	662 except:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	663 ok = 0
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	664 if ok:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	665 return msg, lineno, offset, line
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	666 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	667 return None
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	668
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	669 def showtraceback(self):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	670 "Extend base class method to reset output properly"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	671 self.tkconsole.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	672 self.checklinecache()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	673 InteractiveInterpreter.showtraceback(self)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	674 if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"):
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	675 self.tkconsole.open_stack_viewer()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	676
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	677 def checklinecache(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	678 c = linecache.cache
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	679 for key in list(c.keys()):
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	680 if key[:1] + key[-1:] != "<>":
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	681 del c[key]
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	682
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	683 def runcommand(self, code):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	684 "Run the code without invoking the debugger"
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	685 # The code better not raise an exception!
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	686 if self.tkconsole.executing:
26471 99c78cf95610 Add missing self for method call Neal Norwitz <nnorwitz@gmail.com> parents: 26468 diff changeset	687 self.display_executing_dialog()
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	688 return 0
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	689 if self.rpcclt:
29034 656493534cc7 1. Implement processing of user code in subprocess MainThread. Pass loop Kurt B. Kaiser <kbk@shore.net> parents: 28385 diff changeset	690 self.rpcclt.remotequeue("exec", "runcode", (code,), {})
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	691 else:
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39610 diff changeset	692 exec(code, self.locals)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	693 return 1
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	694
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	695 def runcode(self, code):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	696 "Override base class method"
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	697 if self.tkconsole.executing:
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	698 self.interp.restart_subprocess()
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	699 self.checklinecache()
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	700 if self.save_warnings_filters is not None:
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	701 warnings.filters[:] = self.save_warnings_filters
12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	702 self.save_warnings_filters = None
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	703 debugger = self.debugger
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	704 try:
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	705 self.tkconsole.beginexecuting()
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	706 if not debugger and self.rpcclt is not None:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	707 self.active_seq = self.rpcclt.asyncqueue("exec", "runcode",
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	708 (code,), {})
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	709 elif debugger:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	710 debugger.run(code, self.locals)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	711 else:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	712 exec(code, self.locals)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	713 except SystemExit:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	714 if not self.tkconsole.closing:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	715 if tkMessageBox.askyesno(
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	716 "Exit?",
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	717 "Do you want to exit altogether?",
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	718 default="yes",
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	719 master=self.tkconsole.text):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	720 raise
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	721 else:
40916 f5790f96acf3 Fix merge bug (lost line causing syntax error). Guido van Rossum <guido@python.org> parents: 40893 diff changeset	722 self.showtraceback()
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	723 else:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	724 raise
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	725 except:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	726 if use_subprocess:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	727 print("IDLE internal error in runcode()",
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	728 file=self.tkconsole.stderr)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	729 self.showtraceback()
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	730 self.tkconsole.endexecuting()
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	731 else:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	732 if self.tkconsole.canceled:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	733 self.tkconsole.canceled = False
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	734 print("KeyboardInterrupt", file=self.tkconsole.stderr)
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	735 else:
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40799 diff changeset	736 self.showtraceback()
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	737 finally:
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	738 if not use_subprocess:
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	739 try:
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	740 self.tkconsole.endexecuting()
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	741 except AttributeError: # shell may have closed
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	742 pass
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	743
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	744 def write(self, s):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	745 "Override base class method"
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	746 self.tkconsole.stderr.write(s)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	747
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	748 def display_port_binding_error(self):
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	749 tkMessageBox.showerror(
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	750 "Port Binding Error",
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	751 "IDLE can't bind TCP/IP port 8833, which is necessary to "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	752 "communicate with its Python execution server. Either "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	753 "no networking is installed on this computer or another "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	754 "process (another IDLE?) is using the port. Run IDLE with the -n "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	755 "command line switch to start without a subprocess and refer to "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	756 "Help/IDLE Help 'Running without a subprocess' for further "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	757 "details.",
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	758 master=self.tkconsole.text)
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	759
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	760 def display_no_subprocess_error(self):
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	761 tkMessageBox.showerror(
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	762 "Subprocess Startup Error",
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	763 "IDLE's subprocess didn't make connection. Either IDLE can't "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	764 "start a subprocess or personal firewall software is blocking "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	765 "the connection.",
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	766 master=self.tkconsole.text)
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	767
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	768 def display_executing_dialog(self):
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	769 tkMessageBox.showerror(
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	770 "Already executing",
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	771 "The Python Shell window is already executing a command; "
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	772 "please wait until it is finished.",
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	773 master=self.tkconsole.text)
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	774
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	775
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	776 class PyShell(OutputWindow):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	777
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	778 shell_title = "Python Shell"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	779
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	780 # Override classes
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	781 ColorDelegator = ModifiedColorDelegator
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	782 UndoDelegator = ModifiedUndoDelegator
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	783
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	784 # Override menus
24183 1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	785 menu_specs = [
1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	786 ("file", "_File"),
1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	787 ("edit", "_Edit"),
27336 cbca0bcf1c31 M Bindings.py Kurt B. Kaiser <kbk@shore.net> parents: 27074 diff changeset	788 ("debug", "_Debug"),
27074 b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	789 ("options", "_Options"),
24183 1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	790 ("windows", "_Windows"),
1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	791 ("help", "_Help"),
1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	792 ]
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	793
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	794 if macosxSupport.runningAsOSXApp():
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	795 del menu_specs[-3]
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	796 menu_specs[-2] = ("windows", "_Window")
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	797
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	798
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	799 # New classes
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	800 from .IdleHistory import History
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	801
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	802 def __init__(self, flist=None):
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	803 if use_subprocess:
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	804 ms = self.menu_specs
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	805 if ms[2][0] != "shell":
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	806 ms.insert(2, ("shell", "She_ll"))
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	807 self.interp = ModifiedInterpreter(self)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	808 if flist is None:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	809 root = Tk()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	810 fixwordbreaks(root)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	811 root.withdraw()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	812 flist = PyShellFileList(root)
25691 b39bd03a8dab M CallTips.py Add support for getting calltip from subprocess, Kurt B. Kaiser <kbk@shore.net> parents: 25480 diff changeset	813 #
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	814 OutputWindow.__init__(self, flist, None, None)
25691 b39bd03a8dab M CallTips.py Add support for getting calltip from subprocess, Kurt B. Kaiser <kbk@shore.net> parents: 25480 diff changeset	815 #
34443 cd6b54ba272f 1. Polish tabbing code. Kurt B. Kaiser <kbk@shore.net> parents: 34240 diff changeset	816 ## self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
cd6b54ba272f 1. Polish tabbing code. Kurt B. Kaiser <kbk@shore.net> parents: 34240 diff changeset	817 self.usetabs = True
cd6b54ba272f 1. Polish tabbing code. Kurt B. Kaiser <kbk@shore.net> parents: 34240 diff changeset	818 # indentwidth must be 8 when using tabs. See note in EditorWindow:
cd6b54ba272f 1. Polish tabbing code. Kurt B. Kaiser <kbk@shore.net> parents: 34240 diff changeset	819 self.indentwidth = 8
cd6b54ba272f 1. Polish tabbing code. Kurt B. Kaiser <kbk@shore.net> parents: 34240 diff changeset	820 self.context_use_ps1 = True
25691 b39bd03a8dab M CallTips.py Add support for getting calltip from subprocess, Kurt B. Kaiser <kbk@shore.net> parents: 25480 diff changeset	821 #
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	822 text = self.text
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	823 text.configure(wrap="char")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	824 text.bind("<<newline-and-indent>>", self.enter_callback)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	825 text.bind("<<plain-newline-and-indent>>", self.linefeed_callback)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	826 text.bind("<<interrupt-execution>>", self.cancel_callback)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	827 text.bind("<<beginning-of-line>>", self.home_callback)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	828 text.bind("<<end-of-file>>", self.eof_callback)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	829 text.bind("<<open-stack-viewer>>", self.open_stack_viewer)
29059 92ebd3daf507 1. Update debugger to not trace RPC code even when calling Queue and Kurt B. Kaiser <kbk@shore.net> parents: 29034 diff changeset	830 text.bind("<<toggle-debugger>>", self.toggle_debugger)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	831 text.bind("<<toggle-jit-stack-viewer>>", self.toggle_jit_stack_viewer)
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	832 if use_subprocess:
29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	833 text.bind("<<view-restart>>", self.view_restart_mark)
29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	834 text.bind("<<restart-shell>>", self.restart_shell)
25691 b39bd03a8dab M CallTips.py Add support for getting calltip from subprocess, Kurt B. Kaiser <kbk@shore.net> parents: 25480 diff changeset	835 #
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	836 self.save_stdout = sys.stdout
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	837 self.save_stderr = sys.stderr
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	838 self.save_stdin = sys.stdin
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	839 from . import IOBinding
29582 ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	840 self.stdout = PseudoFile(self, "stdout", IOBinding.encoding)
ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	841 self.stderr = PseudoFile(self, "stderr", IOBinding.encoding)
ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	842 self.console = PseudoFile(self, "console", IOBinding.encoding)
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	843 if not use_subprocess:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	844 sys.stdout = self.stdout
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	845 sys.stderr = self.stderr
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	846 sys.stdin = self
25691 b39bd03a8dab M CallTips.py Add support for getting calltip from subprocess, Kurt B. Kaiser <kbk@shore.net> parents: 25480 diff changeset	847 #
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	848 self.history = self.History(self.text)
25691 b39bd03a8dab M CallTips.py Add support for getting calltip from subprocess, Kurt B. Kaiser <kbk@shore.net> parents: 25480 diff changeset	849 #
29171 9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	850 self.pollinterval = 50 # millisec
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	851
32272 014b0d84422f Noam Raphel: Further developemt of CodeContext feature. Kurt B. Kaiser <kbk@shore.net> parents: 31625 diff changeset	852 def get_standard_extension_names(self):
014b0d84422f Noam Raphel: Further developemt of CodeContext feature. Kurt B. Kaiser <kbk@shore.net> parents: 31625 diff changeset	853 return idleConf.GetExtensions(shell_only=True)
014b0d84422f Noam Raphel: Further developemt of CodeContext feature. Kurt B. Kaiser <kbk@shore.net> parents: 31625 diff changeset	854
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	855 reading = False
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	856 executing = False
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	857 canceled = False
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	858 endoffile = False
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	859 closing = False
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	860
32484 f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	861 def set_warning_stream(self, stream):
32512 c4ed14fab12a whitespace normalization Skip Montanaro <skip@pobox.com> parents: 32484 diff changeset	862 global warning_stream
c4ed14fab12a whitespace normalization Skip Montanaro <skip@pobox.com> parents: 32484 diff changeset	863 warning_stream = stream
32484 f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	864
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	865 def get_warning_stream(self):
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	866 return warning_stream
f3cb95cd413f Redirect the warning stream to the shell during the ScriptBinding check of user code Kurt B. Kaiser <kbk@shore.net> parents: 32272 diff changeset	867
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	868 def toggle_debugger(self, event=None):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	869 if self.executing:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	870 tkMessageBox.showerror("Don't debug now",
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	871 "You can only toggle the debugger when idle",
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	872 master=self.text)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	873 self.set_debugger_indicator()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	874 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	875 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	876 db = self.interp.getdebugger()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	877 if db:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	878 self.close_debugger()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	879 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	880 self.open_debugger()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	881
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	882 def set_debugger_indicator(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	883 db = self.interp.getdebugger()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	884 self.setvar("<<toggle-debugger>>", not not db)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	885
27074 b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	886 def toggle_jit_stack_viewer(self, event=None):
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	887 pass # All we need is the variable
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	888
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	889 def close_debugger(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	890 db = self.interp.getdebugger()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	891 if db:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	892 self.interp.setdebugger(None)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	893 db.close()
23995 41468f9353ce Shutdown subprocess debugger and associated Proxies/Adapters when closing Kurt B. Kaiser <kbk@shore.net> parents: 23969 diff changeset	894 if self.interp.rpcclt:
41468f9353ce Shutdown subprocess debugger and associated Proxies/Adapters when closing Kurt B. Kaiser <kbk@shore.net> parents: 23969 diff changeset	895 RemoteDebugger.close_remote_debugger(self.interp.rpcclt)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	896 self.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	897 self.console.write("[DEBUG OFF]\n")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	898 sys.ps1 = ">>> "
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	899 self.showprompt()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	900 self.set_debugger_indicator()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	901
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	902 def open_debugger(self):
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	903 if self.interp.rpcclt:
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	904 dbg_gui = RemoteDebugger.start_remote_debugger(self.interp.rpcclt,
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	905 self)
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	906 else:
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	907 dbg_gui = Debugger.Debugger(self)
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	908 self.interp.setdebugger(dbg_gui)
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	909 dbg_gui.load_breakpoints()
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	910 sys.ps1 = "[DEBUG ON]\n>>> "
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	911 self.showprompt()
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	912 self.set_debugger_indicator()
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	913
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	914 def beginexecuting(self):
23995 41468f9353ce Shutdown subprocess debugger and associated Proxies/Adapters when closing Kurt B. Kaiser <kbk@shore.net> parents: 23969 diff changeset	915 "Helper for ModifiedInterpreter"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	916 self.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	917 self.executing = 1
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	918
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	919 def endexecuting(self):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	920 "Helper for ModifiedInterpreter"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	921 self.executing = 0
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	922 self.canceled = 0
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	923 self.showprompt()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	924
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	925 def close(self):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	926 "Extend EditorWindow.close()"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	927 if self.executing:
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	928 response = tkMessageBox.askokcancel(
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	929 "Kill?",
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	930 "The program is still running!\n Do you want to kill it?",
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	931 default="ok",
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	932 parent=self.text)
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	933 if response == False:
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	934 return "cancel"
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	935 if self.reading:
914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	936 self.top.quit()
914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	937 self.canceled = True
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	938 self.closing = True
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	939 # Wait for poll_subprocess() rescheduling to stop
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	940 self.text.after(2 * self.pollinterval, self.close2)
29171 9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	941
9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	942 def close2(self):
9cf09f92b198 Fix race exposed by 2.4 GHz XP box: Don't tear down PyShell until Kurt B. Kaiser <kbk@shore.net> parents: 29122 diff changeset	943 return EditorWindow.close(self)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	944
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	945 def _close(self):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	946 "Extend EditorWindow._close(), shut down debugger and execution server"
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	947 self.close_debugger()
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	948 if use_subprocess:
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	949 self.interp.kill_subprocess()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	950 # Restore std streams
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	951 sys.stdout = self.save_stdout
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	952 sys.stderr = self.save_stderr
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	953 sys.stdin = self.save_stdin
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	954 # Break cycles
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	955 self.interp = None
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	956 self.console = None
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	957 self.flist.pyshell = None
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	958 self.history = None
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	959 EditorWindow._close(self)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	960
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	961 def ispythonsource(self, filename):
23969 edd7c0146ac8 Clear associated breakpoints when closing an edit window. Kurt B. Kaiser <kbk@shore.net> parents: 23932 diff changeset	962 "Override EditorWindow method: never remove the colorizer"
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	963 return True
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	964
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	965 def short_title(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	966 return self.shell_title
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	967
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	968 COPYRIGHT = \
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	969 'Type "copyright", "credits" or "license()" for more information.'
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	970
30001 52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	971 firewallmessage = """
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	972 ****************************************************************
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	973 Personal firewall software may warn about the connection IDLE
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	974 makes to its subprocess using this computer's internal loopback
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	975 interface. This connection is not visible on any external
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	976 interface and no data is sent to or received from the Internet.
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	977 ****************************************************************
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	978 """
52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	979
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	980 def begin(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	981 self.resetoutput()
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	982 if use_subprocess:
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	983 nosub = ''
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	984 client = self.interp.start_subprocess()
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	985 if not client:
266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	986 self.close()
31414 14dea6f8b0c3 There was an error in the Tk error dialog fix at Rev 1.84 which caused starting Kurt B. Kaiser <kbk@shore.net> parents: 31412 diff changeset	987 return False
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	988 else:
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	989 nosub = "==== No Subprocess ===="
30001 52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	990 self.write("Python %s on %s\n%s\n%s\nIDLE %s %s\n" %
18560 12e7ad108229 cvs-py-rel2_1 (Rev 1.29 - 1.33) merge Kurt B. Kaiser <kbk@shore.net> parents: 13975 diff changeset	991 (sys.version, sys.platform, self.COPYRIGHT,
30001 52dd548d3be9 Added a banner to the shell startup message discussing possible Kurt B. Kaiser <kbk@shore.net> parents: 29794 diff changeset	992 self.firewallmessage, idlever.IDLE_VERSION, nosub))
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	993 self.showprompt()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	994 import Tkinter
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	995 Tkinter._default_root = None # 03Jan04 KBK What's this?
31414 14dea6f8b0c3 There was an error in the Tk error dialog fix at Rev 1.84 which caused starting Kurt B. Kaiser <kbk@shore.net> parents: 31412 diff changeset	996 return True
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	997
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	998 def readline(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	999 save = self.reading
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1000 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1001 self.reading = 1
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1002 self.top.mainloop() # nested mainloop()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1003 finally:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1004 self.reading = save
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1005 line = self.text.get("iomark", "end-1c")
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1006 if len(line) == 0: # may be EOF if we quit our mainloop with Ctrl-C
914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1007 line = "\n"
41575 beacf40b5960 Rip out all the u"..." literals and calls to unicode(). Guido van Rossum <guido@python.org> parents: 40916 diff changeset	1008 if isinstance(line, str):
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	1009 from . import IOBinding
29582 ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	1010 try:
ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	1011 line = line.encode(IOBinding.encoding)
ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	1012 except UnicodeError:
ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	1013 pass
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1014 self.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1015 if self.canceled:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1016 self.canceled = 0
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1017 if not use_subprocess:
914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1018 raise KeyboardInterrupt
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1019 if self.endoffile:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1020 self.endoffile = 0
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1021 line = ""
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1022 return line
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1023
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1024 def isatty(self):
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	1025 return True
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1026
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1027 def cancel_callback(self, event=None):
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1028 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1029 if self.text.compare("sel.first", "!=", "sel.last"):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1030 return # Active selection -- always use default binding
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1031 except:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1032 pass
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1033 if not (self.executing or self.reading):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1034 self.resetoutput()
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	1035 self.interp.write("KeyboardInterrupt\n")
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1036 self.showprompt()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1037 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1038 self.endoffile = 0
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1039 self.canceled = 1
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1040 if (self.executing and self.interp.rpcclt):
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	1041 if self.interp.getdebugger():
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	1042 self.interp.restart_subprocess()
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	1043 else:
be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	1044 self.interp.interrupt_subprocess()
34240 914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1045 if self.reading:
914534f6ef61 The GUI was hanging if the shell window was closed while a raw_input() Kurt B. Kaiser <kbk@shore.net> parents: 34212 diff changeset	1046 self.top.quit() # exit the nested mainloop() in readline()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1047 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1048
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1049 def eof_callback(self, event):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1050 if self.executing and not self.reading:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1051 return # Let the default binding (delete next char) take over
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1052 if not (self.text.compare("iomark", "==", "insert") and
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1053 self.text.compare("insert", "==", "end-1c")):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1054 return # Let the default binding (delete next char) take over
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1055 if not self.executing:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1056 self.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1057 self.close()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1058 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1059 self.canceled = 0
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1060 self.endoffile = 1
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1061 self.top.quit()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1062 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1063
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1064 def home_callback(self, event):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1065 if event.state != 0 and event.keysym == "Home":
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1066 return # <Modifier-Home>; fall back to class binding
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1067 if self.text.compare("iomark", "<=", "insert") and \
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1068 self.text.compare("insert linestart", "<=", "iomark"):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1069 self.text.mark_set("insert", "iomark")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1070 self.text.tag_remove("sel", "1.0", "end")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1071 self.text.see("insert")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1072 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1073
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1074 def linefeed_callback(self, event):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1075 # Insert a linefeed without entering anything (still autoindented)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1076 if self.reading:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1077 self.text.insert("insert", "\n")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1078 self.text.see("insert")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1079 else:
26667 f76717707a6d M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26659 diff changeset	1080 self.newline_and_indent_event(event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1081 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1082
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1083 def enter_callback(self, event):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1084 if self.executing and not self.reading:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1085 return # Let the default binding (insert '\n') take over
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1086 # If some text is selected, recall the selection
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1087 # (but only if this before the I/O mark)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1088 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1089 sel = self.text.get("sel.first", "sel.last")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1090 if sel:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1091 if self.text.compare("sel.last", "<=", "iomark"):
35112 58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1092 self.recall(sel, event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1093 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1094 except:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1095 pass
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1096 # If we're strictly before the line containing iomark, recall
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1097 # the current line, less a leading prompt, less leading or
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1098 # trailing whitespace
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1099 if self.text.compare("insert", "<", "iomark linestart"):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1100 # Check if there's a relevant stdin range -- if so, use it
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1101 prev = self.text.tag_prevrange("stdin", "insert")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1102 if prev and self.text.compare("insert", "<", prev[1]):
35112 58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1103 self.recall(self.text.get(prev[0], prev[1]), event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1104 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1105 next = self.text.tag_nextrange("stdin", "insert")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1106 if next and self.text.compare("insert lineend", ">=", next[0]):
35112 58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1107 self.recall(self.text.get(next[0], next[1]), event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1108 return "break"
26827 13d59dbfb8d4 M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26788 diff changeset	1109 # No stdin mark -- just get the current line, less any prompt
35891 8fd46b660e66 Merge IDLE-syntax-branch r39668:41449 into trunk Kurt B. Kaiser <kbk@shore.net> parents: 35504 diff changeset	1110 indices = self.text.tag_nextrange("console", "insert linestart")
8fd46b660e66 Merge IDLE-syntax-branch r39668:41449 into trunk Kurt B. Kaiser <kbk@shore.net> parents: 35504 diff changeset	1111 if indices and \
8fd46b660e66 Merge IDLE-syntax-branch r39668:41449 into trunk Kurt B. Kaiser <kbk@shore.net> parents: 35504 diff changeset	1112 self.text.compare(indices[0], "<=", "insert linestart"):
8fd46b660e66 Merge IDLE-syntax-branch r39668:41449 into trunk Kurt B. Kaiser <kbk@shore.net> parents: 35504 diff changeset	1113 self.recall(self.text.get(indices[1], "insert lineend"), event)
8fd46b660e66 Merge IDLE-syntax-branch r39668:41449 into trunk Kurt B. Kaiser <kbk@shore.net> parents: 35504 diff changeset	1114 else:
8fd46b660e66 Merge IDLE-syntax-branch r39668:41449 into trunk Kurt B. Kaiser <kbk@shore.net> parents: 35504 diff changeset	1115 self.recall(self.text.get("insert linestart", "insert lineend"), event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1116 return "break"
26667 f76717707a6d M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26659 diff changeset	1117 # If we're between the beginning of the line and the iomark, i.e.
26827 13d59dbfb8d4 M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26788 diff changeset	1118 # in the prompt area, move to the end of the prompt
26667 f76717707a6d M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26659 diff changeset	1119 if self.text.compare("insert", "<", "iomark"):
26827 13d59dbfb8d4 M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26788 diff changeset	1120 self.text.mark_set("insert", "iomark")
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1121 # If we're in the current input and there's only whitespace
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1122 # beyond the cursor, erase that whitespace first
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1123 s = self.text.get("insert", "end-1c")
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	1124 if s and not s.strip():
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1125 self.text.delete("insert", "end-1c")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1126 # If we're in the current input before its last line,
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1127 # insert a newline right at the insert point
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1128 if self.text.compare("insert", "<", "end-1c linestart"):
26667 f76717707a6d M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26659 diff changeset	1129 self.newline_and_indent_event(event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1130 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1131 # We're in the last line; append a newline and submit it
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1132 self.text.mark_set("insert", "end-1c")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1133 if self.reading:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1134 self.text.insert("insert", "\n")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1135 self.text.see("insert")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1136 else:
26667 f76717707a6d M EditorWindow.py Kurt B. Kaiser <kbk@shore.net> parents: 26659 diff changeset	1137 self.newline_and_indent_event(event)
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1138 self.text.tag_add("stdin", "iomark", "end-1c")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1139 self.text.update_idletasks()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1140 if self.reading:
37045 081b4f0e81b7 Get rid of a bunch more raw_input references Neal Norwitz <nnorwitz@gmail.com> parents: 35891 diff changeset	1141 self.top.quit() # Break out of recursive mainloop()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1142 else:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1143 self.runit()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1144 return "break"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1145
35112 58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1146 def recall(self, s, event):
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1147 # remove leading and trailing empty or whitespace lines
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1148 s = re.sub(r'^\s*\n', '' , s)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1149 s = re.sub(r'\n\s*$', '', s)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1150 lines = s.split('\n')
35112 58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1151 self.text.undo_block_start()
58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1152 try:
58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1153 self.text.tag_remove("sel", "1.0", "end")
58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1154 self.text.mark_set("insert", "end-1c")
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1155 prefix = self.text.get("insert linestart", "insert")
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1156 if prefix.rstrip().endswith(':'):
35118 2d833123b119 Remove dead code Kurt B. Kaiser <kbk@shore.net> parents: 35112 diff changeset	1157 self.newline_and_indent_event(event)
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1158 prefix = self.text.get("insert linestart", "insert")
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1159 self.text.insert("insert", lines[0].strip())
35118 2d833123b119 Remove dead code Kurt B. Kaiser <kbk@shore.net> parents: 35112 diff changeset	1160 if len(lines) > 1:
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1161 orig_base_indent = re.search(r'^([ \t]*)', lines[0]).group(0)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1162 new_base_indent = re.search(r'^([ \t]*)', prefix).group(0)
35118 2d833123b119 Remove dead code Kurt B. Kaiser <kbk@shore.net> parents: 35112 diff changeset	1163 for line in lines[1:]:
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1164 if line.startswith(orig_base_indent):
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1165 # replace orig base indentation with new indentation
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1166 line = new_base_indent + line[len(orig_base_indent):]
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1167 self.text.insert('insert', '\n'+line.rstrip())
35112 58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1168 finally:
58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1169 self.text.see("insert")
58632092e023 <Enter> when cursor is on a previous command retrieves that command. Instead Kurt B. Kaiser <kbk@shore.net> parents: 34948 diff changeset	1170 self.text.undo_block_stop()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1171
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1172 def runit(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1173 line = self.text.get("iomark", "end-1c")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1174 # Strip off last newline and surrounding whitespace.
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1175 # (To allow you to hit return twice to end a statement.)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1176 i = len(line)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1177 while i > 0 and line[i-1] in " \t":
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1178 i = i-1
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1179 if i > 0 and line[i-1] == "\n":
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1180 i = i-1
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1181 while i > 0 and line[i-1] in " \t":
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1182 i = i-1
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1183 line = line[:i]
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1184 more = self.interp.runsource(line)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1185
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1186 def open_stack_viewer(self, event=None):
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	1187 if self.interp.rpcclt:
b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	1188 return self.interp.remote_stack_viewer()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1189 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1190 sys.last_traceback
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1191 except:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1192 tkMessageBox.showerror("No stack trace",
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1193 "There is no stack trace yet.\n"
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1194 "(sys.last_traceback is not defined)",
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1195 master=self.text)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1196 return
42324 4bbbe0c55fa2 Merged revisions 56443-56466 via svnmerge from Guido van Rossum <guido@python.org> parents: 42309 diff changeset	1197 from .StackViewer import StackBrowser
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1198 sv = StackBrowser(self.root, self.flist)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1199
27074 b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	1200 def view_restart_mark(self, event=None):
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	1201 self.text.see("iomark")
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	1202 self.text.see("restart")
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	1203
b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	1204 def restart_shell(self, event=None):
29254 be70b8477f43 1. Stake Freddy. Kurt B. Kaiser <kbk@shore.net> parents: 29171 diff changeset	1205 self.interp.restart_subprocess()
27074 b865925ef68a M AutoExpand.py Kurt B. Kaiser <kbk@shore.net> parents: 26959 diff changeset	1206
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1207 def showprompt(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1208 self.resetoutput()
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1209 try:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1210 s = str(sys.ps1)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1211 except:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1212 s = ""
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1213 self.console.write(s)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1214 self.text.mark_set("insert", "end-1c")
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	1215 self.set_line_and_column()
24183 1723bcdc1e85 1. Prevent Undo before IOmark in PyShell.PyShell Kurt B. Kaiser <kbk@shore.net> parents: 23995 diff changeset	1216 self.io.reset_undo()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1217
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1218 def resetoutput(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1219 source = self.text.get("iomark", "end-1c")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1220 if self.history:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1221 self.history.history_store(source)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1222 if self.text.get("end-2c") != "\n":
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1223 self.text.insert("end-1c", "\n")
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1224 self.text.mark_set("iomark", "end-1c")
23547 b74afdd072eb GvR's rpc patch Chui Tey <chui.tey@advdata.com.au> parents: 22599 diff changeset	1225 self.set_line_and_column()
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1226
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1227 def write(self, s, tags=()):
27920 8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1228 try:
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1229 self.text.mark_gravity("iomark", "right")
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1230 OutputWindow.write(self, s, tags, "iomark")
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1231 self.text.mark_gravity("iomark", "left")
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1232 except:
8e7432cdf7d8 M NEWS.txt Kurt B. Kaiser <kbk@shore.net> parents: 27545 diff changeset	1233 pass
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1234 if self.canceled:
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1235 self.canceled = 0
29119 7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	1236 if not use_subprocess:
7875fcaae7a3 1. Restore the capability to run and debug without a subprocess. Kurt B. Kaiser <kbk@shore.net> parents: 29101 diff changeset	1237 raise KeyboardInterrupt
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1238
34212 1e8b033f91dc The remote procedure call module rpc.py can now access data attributes of Kurt B. Kaiser <kbk@shore.net> parents: 33989 diff changeset	1239 class PseudoFile(object):
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1240
29582 ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	1241 def __init__(self, shell, tags, encoding=None):
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1242 self.shell = shell
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1243 self.tags = tags
29582 ee14e5b06ed1 Idlefork patch #682347: convert Unicode strings from readline to Martin v. Löwis <martin@v.loewis.de> parents: 29476 diff changeset	1244 self.encoding = encoding
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1245
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1246 def write(self, s):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1247 self.shell.write(s, self.tags)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1248
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1249 def writelines(self, l):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1250 map(self.write, l)
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1251
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1252 def flush(self):
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1253 pass
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1254
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1255 def isatty(self):
25310 eb7b7b719ee5 Merge Py Idle changes: Kurt B. Kaiser <kbk@shore.net> parents: 25261 diff changeset	1256 return True
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1257
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1258
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1259 usage_msg = """\
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1260
29122 c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	1261 USAGE: idle [-deins] [-t title] [file]*
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	1262 idle [-dns] [-t title] (-c cmd \| -r file) [arg]*
c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	1263 idle [-dns] [-t title] - [arg]*
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	1264
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1265 -h print this help message and exit
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	1266 -n run IDLE without a subprocess (see Help/IDLE Help for details)
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1267
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1268 The following options will override the IDLE 'settings' configuration:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1269
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1270 -e open an edit window
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1271 -i open a shell window
18649 8aa63aea7269 Implement idle command interface as suggested by GvR [idle-dev] 16 July Kurt B. Kaiser <kbk@shore.net> parents: 18614 diff changeset	1272
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1273 The following options imply -i and will open a shell:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1274
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1275 -c cmd run the command in a shell, or
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1276 -r file run script from file
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1277
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1278 -d enable the debugger
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1279 -s run $IDLESTARTUP or $PYTHONSTARTUP before anything else
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1280 -t title set title of shell window
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1281
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1282 A default edit window will be bypassed when -c, -r, or - are used.
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1283
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1284 [arg]* are passed to the command (-c) or script (-r) in sys.argv[1:].
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1285
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1286 Examples:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1287
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1288 idle
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1289 Open an edit window or shell depending on IDLE's configuration.
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1290
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1291 idle foo.py foobar.py
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1292 Edit the files, also open a shell if configured to start with shell.
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1293
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1294 idle -est "Baz" foo.py
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1295 Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1296 window with the title "Baz".
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1297
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1298 idle -c "import sys; print sys.argv" "foo"
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1299 Open a shell window and run the command, passing "-c" in sys.argv[0]
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1300 and "foo" in sys.argv[1].
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1301
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1302 idle -d -s -r foo.py "Hello World"
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1303 Open a shell window, run a startup script, enable the debugger, and
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1304 run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1305 sys.argv[1].
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1306
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1307 echo "import sys; print sys.argv" \| idle - "foobar"
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1308 Open a shell window, run the script piped in, passing '' in sys.argv[0]
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1309 and "foobar" in sys.argv[1].
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1310 """
30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1311
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1312 def main():
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1313 global flist, root, use_subprocess
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1314
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	1315 use_subprocess = True
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1316 enable_shell = False
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1317 enable_edit = False
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1318 debug = False
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1319 cmd = None
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1320 script = None
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1321 startup = False
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1322 try:
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	1323 opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:")
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40450 diff changeset	1324 except getopt.error as msg:
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1325 sys.stderr.write("Error: %s\n" % str(msg))
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1326 sys.stderr.write(usage_msg)
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1327 sys.exit(2)
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1328 for o, a in opts:
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1329 if o == '-c':
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1330 cmd = a
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1331 enable_shell = True
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1332 if o == '-d':
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1333 debug = True
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1334 enable_shell = True
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1335 if o == '-e':
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1336 enable_edit = True
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1337 if o == '-h':
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1338 sys.stdout.write(usage_msg)
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1339 sys.exit()
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1340 if o == '-i':
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1341 enable_shell = True
29121 29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	1342 if o == '-n':
29f19460f067 1. Add a command line switch to run without the subprocess Kurt B. Kaiser <kbk@shore.net> parents: 29120 diff changeset	1343 use_subprocess = False
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1344 if o == '-r':
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1345 script = a
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1346 if os.path.isfile(script):
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1347 pass
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1348 else:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1349 print("No script file: ", script)
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1350 sys.exit()
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1351 enable_shell = True
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1352 if o == '-s':
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1353 startup = True
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1354 enable_shell = True
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1355 if o == '-t':
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1356 PyShell.shell_title = a
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1357 enable_shell = True
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1358 if args and args[0] == '-':
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1359 cmd = sys.stdin.read()
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1360 enable_shell = True
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1361 # process sys.argv and sys.path:
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1362 for i in range(len(sys.path)):
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1363 sys.path[i] = os.path.abspath(sys.path[i])
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1364 if args and args[0] == '-':
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1365 sys.argv = [''] + args[1:]
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1366 elif cmd:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1367 sys.argv = ['-c'] + args
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1368 elif script:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1369 sys.argv = [script] + args
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1370 elif args:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1371 enable_edit = True
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1372 pathx = []
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1373 for filename in args:
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1374 pathx.append(os.path.dirname(filename))
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1375 for dir in pathx:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1376 dir = os.path.abspath(dir)
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1377 if not dir in sys.path:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1378 sys.path.insert(0, dir)
26741 cadfce66d861 When IDLE is installed and run from a startup script, the script's Kurt B. Kaiser <kbk@shore.net> parents: 26740 diff changeset	1379 else:
cadfce66d861 When IDLE is installed and run from a startup script, the script's Kurt B. Kaiser <kbk@shore.net> parents: 26740 diff changeset	1380 dir = os.getcwd()
cadfce66d861 When IDLE is installed and run from a startup script, the script's Kurt B. Kaiser <kbk@shore.net> parents: 26740 diff changeset	1381 if not dir in sys.path:
cadfce66d861 When IDLE is installed and run from a startup script, the script's Kurt B. Kaiser <kbk@shore.net> parents: 26740 diff changeset	1382 sys.path.insert(0, dir)
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1383 # check the IDLE settings configuration (but command line overrides)
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1384 edit_start = idleConf.GetOption('main', 'General',
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	1385 'editor-on-startup', type='bool')
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1386 enable_edit = enable_edit or edit_start
26959 b8c72e86a12d Whitespace Normalization Kurt B. Kaiser <kbk@shore.net> parents: 26827 diff changeset	1387 enable_shell = enable_shell or not edit_start
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1388 # start editor and/or shell windows:
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1389 root = Tk(className="Idle")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1390
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1391 fixwordbreaks(root)
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1392 root.withdraw()
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1393 flist = PyShellFileList(root)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1394 macosxSupport.setupApp(root, flist)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1395
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1396 if enable_edit:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1397 if not (cmd or script):
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1398 for filename in args:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1399 flist.open(filename)
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1400 if not args:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1401 flist.new()
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	1402 if enable_shell:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1403 shell = flist.open_shell()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1404 if not shell:
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	1405 return # couldn't open shell
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1406
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1407 if macosxSupport.runningAsOSXApp() and flist.dict:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1408 # On OSX: when the user has double-clicked on a file that causes
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1409 # IDLE to be launched the shell window will open just in front of
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1410 # the file she wants to see. Lower the interpreter window when
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1411 # there are open files.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1412 shell.top.lower()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1413
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1414 shell = flist.pyshell
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1415 # handle remaining options:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1416 if debug:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1417 shell.open_debugger()
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1418 if startup:
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1419 filename = os.environ.get("IDLESTARTUP") or \
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1420 os.environ.get("PYTHONSTARTUP")
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1421 if filename and os.path.isfile(filename):
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1422 shell.interp.execfile(filename)
31412 266f226f471d Added a Tk error dialog to run.py inform the user if the subprocess can't Kurt B. Kaiser <kbk@shore.net> parents: 31013 diff changeset	1423 if shell and cmd or script:
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1424 shell.interp.runcommand("""if 1:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1425 import sys as _sys
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	1426 _sys.argv = %r
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1427 del _sys
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 31414 diff changeset	1428 \n""" % (sys.argv,))
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1429 if cmd:
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1430 shell.interp.execsource(cmd)
615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1431 elif script:
29122 c7dfda993b2f 1. When a module is run from an EditorWindow, if its directory is not in Kurt B. Kaiser <kbk@shore.net> parents: 29121 diff changeset	1432 shell.interp.prepend_syspath(script)
26590 615a25a6eb5b Rework the command line interface, incorporating the shell/edit Kurt B. Kaiser <kbk@shore.net> parents: 26557 diff changeset	1433 shell.interp.execfile(script)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37045 diff changeset	1434
23784 24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1435 root.mainloop()
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1436 root.destroy()
24b0f6d693e3 Rework the code to have only the GvR RPC. Output from execution of user Kurt B. Kaiser <kbk@shore.net> parents: 23547 diff changeset	1437
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1438 if __name__ == "__main__":
29476 51060b169b32 Support testing in .../Lib/idlelib when calling <python PyShell.py> Kurt B. Kaiser <kbk@shore.net> parents: 29452 diff changeset	1439 sys.modules['PyShell'] = sys.modules['__main__']
13975 30713d5288df Initial revision David Scherer <dscherer@cmu.edu> parents: diff changeset	1440 main()

Mercurial > cpython-lru_cache-weakref

annotate Lib/idlelib/PyShell.py @ 42324:4bbbe0c55fa2