mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

MERGE DS_RPC_BRANCH into MAIN

Browse source 
PyShell.py
    don't track Py Idle patch 543222 - disable script bindings in shell
    since it was done differently in MAIN

    Remove "binding comments" 05 Aug 1.13.2.2 to 1.13.2.3
This commit is contained in:
Kurt B. Kaiser 2002-09-14 02:50:56 +00:00
parent 8c11f7e3bf
commit ee7afca550
1 changed files with 4 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Lib/idlelib/PyShell.py
View file

@ -55,40 +55,6 @@ def linecache_checkcache(orig_checkcache=linecache.checkcache):
cache.update(save) cache.update(save)
linecache.checkcache = linecache_checkcache linecache.checkcache = linecache_checkcache
# Note: <<newline-and-indent>> event is defined in AutoIndent.py
#$ event <<plain-newline-and-indent>>
#$ win <Control-j>
#$ unix <Control-j>
#$ event <<beginning-of-line>>
#$ win <Control-a>
#$ win <Home>
#$ unix <Control-a>
#$ unix <Home>
#$ event <<history-next>>
#$ win <Alt-n>
#$ unix <Alt-n>
#$ event <<history-previous>>
#$ win <Alt-p>
#$ unix <Alt-p>
#$ event <<interrupt-execution>>
#$ win <Control-c>
#$ unix <Control-c>
#$ event <<end-of-file>>
#$ win <Control-d>
#$ unix <Control-d>
#$ event <<open-stack-viewer>>
#$ event <<toggle-debugger>>
class PyShellEditorWindow(EditorWindow): class PyShellEditorWindow(EditorWindow):
"Regular text edit window when a shell is present" "Regular text edit window when a shell is present"
# XXX ought to merge with regular editor window # XXX ought to merge with regular editor window
@ -496,8 +462,7 @@ class PyShell(OutputWindow):
import __builtin__ import __builtin__
__builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D." __builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D."
self.auto = self.extensions["AutoIndent"] # Required extension self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
self.auto.config(usetabs=1, indentwidth=8, context_use_ps1=1)
text = self.text text = self.text
text.configure(wrap="char") text.configure(wrap="char")
@ -627,7 +592,6 @@ class PyShell(OutputWindow):
# Break cycles # Break cycles
self.interp = None self.interp = None
self.console = None self.console = None
self.auto = None
self.flist.pyshell = None self.flist.pyshell = None
self.history = None self.history = None
EditorWindow._close(self) EditorWindow._close(self)
@ -736,7 +700,7 @@ class PyShell(OutputWindow):
self.text.insert("insert", "\n") self.text.insert("insert", "\n")
self.text.see("insert") self.text.see("insert")
else: else:
self.auto.auto_indent(event) self.auto_indent(event)
return "break" return "break"
def enter_callback(self, event): def enter_callback(self, event):
@ -776,7 +740,7 @@ class PyShell(OutputWindow):
# If we're in the current input before its last line, # If we're in the current input before its last line,
# insert a newline right at the insert point # insert a newline right at the insert point
if self.text.compare("insert", "<", "end-1c linestart"): if self.text.compare("insert", "<", "end-1c linestart"):
self.auto.auto_indent(event) self.auto_indent(event)
return "break" return "break"
# We're in the last line; append a newline and submit it # We're in the last line; append a newline and submit it
self.text.mark_set("insert", "end-1c") self.text.mark_set("insert", "end-1c")
@ -784,7 +748,7 @@ class PyShell(OutputWindow):
self.text.insert("insert", "\n") self.text.insert("insert", "\n")
self.text.see("insert") self.text.see("insert")
else: else:
self.auto.auto_indent(event) self.auto_indent(event)
self.text.tag_add("stdin", "iomark", "end-1c") self.text.tag_add("stdin", "iomark", "end-1c")
self.text.update_idletasks() self.text.update_idletasks()
if self.reading: if self.reading: