[Python-checkins] python/dist/src/Tools/idle EditorWindow.py,1.38,1.38.18.1 PyShell.py,1.35,1.35.16.1 ScriptBinding.py,1.11,1.11.16.1

rhettinger@users.sourceforge.net rhettinger@users.sourceforge.net
Mon, 23 Sep 2002 07:01:43 -0700


Update of /cvsroot/python/python/dist/src/Tools/idle
In directory usw-pr-cvs1:/tmp/cvs-serv17258

Modified Files:
      Tag: release22-maint
	EditorWindow.py PyShell.py ScriptBinding.py 
Log Message:
Backport patch 543222. Disable script bindings in shell window.


Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/EditorWindow.py,v
retrieving revision 1.38
retrieving revision 1.38.18.1
diff -C2 -d -r1.38 -r1.38.18.1
*** EditorWindow.py	18 Apr 2001 18:42:48 -0000	1.38
--- EditorWindow.py	23 Sep 2002 14:01:39 -0000	1.38.18.1
***************
*** 96,99 ****
--- 96,100 ----
  
      vars = {}
+     runnable = False    # Shell window cannot Import Module or Run Script
  
      def __init__(self, flist=None, filename=None, key=None, root=None):

Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/PyShell.py,v
retrieving revision 1.35
retrieving revision 1.35.16.1
diff -C2 -d -r1.35 -r1.35.16.1
*** PyShell.py	20 Jul 2001 18:58:42 -0000	1.35
--- PyShell.py	23 Sep 2002 14:01:40 -0000	1.35.16.1
***************
*** 77,80 ****
--- 77,81 ----
      # Regular text edit window when a shell is present
      # XXX ought to merge with regular editor window
+     runnable = True
  
      def __init__(self, *args):

Index: ScriptBinding.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/ScriptBinding.py,v
retrieving revision 1.11
retrieving revision 1.11.16.1
diff -C2 -d -r1.11 -r1.11.16.1
*** ScriptBinding.py	7 Aug 2001 17:15:36 -0000	1.11
--- ScriptBinding.py	23 Sep 2002 14:01:40 -0000	1.11.16.1
***************
*** 52,55 ****
--- 52,58 ----
  
      def __init__(self, editwin):
+         if not editwin.runnable:
+             self.menudefs = []
+             self.keydefs = {}
          self.editwin = editwin
          # Provide instance variables referenced by Debugger