[Idle-dev] CVS: idle EditorWindow.py,1.23.2.2,1.23.2.3 PyShell.py,1.13.2.1,1.13.2.2 ScriptBinding.py,1.4,1.4.2.1

[Stephen M. Gava]

Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv13689

Modified Files:
      Tag: DS_RPC_BRANCH
	EditorWindow.py PyShell.py ScriptBinding.py 
Log Message:
tracking python idle:
merge changes for python idle patch 543222 - disable script bindings in shell window



Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/idlefork/idle/EditorWindow.py,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -r1.23.2.2 -r1.23.2.3
*** EditorWindow.py	22 Jul 2002 03:06:01 -0000	1.23.2.2
--- EditorWindow.py	24 Jul 2002 23:44:02 -0000	1.23.2.3
***************
*** 94,97 ****
--- 94,98 ----
  
      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/idlefork/idle/PyShell.py,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** PyShell.py	6 Jun 2002 03:15:53 -0000	1.13.2.1
--- PyShell.py	24 Jul 2002 23:44:02 -0000	1.13.2.2
***************
*** 98,102 ****
      # Regular text edit window when a shell is present
      # XXX ought to merge with regular editor window
! 
      def __init__(self, *args):
          apply(EditorWindow.__init__, (self,) + args)
--- 98,103 ----
      # Regular text edit window when a shell is present
      # XXX ought to merge with regular editor window
!     runnable = True  # Shell not present, enable Import Module and Run Script
!     
      def __init__(self, *args):
          apply(EditorWindow.__init__, (self,) + args)

Index: ScriptBinding.py
===================================================================
RCS file: /cvsroot/idlefork/idle/ScriptBinding.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** ScriptBinding.py	19 Jan 2002 10:41:51 -0000	1.4
--- ScriptBinding.py	24 Jul 2002 23:44:02 -0000	1.4.2.1
***************
*** 46,49 ****
--- 46,52 ----
  
      def __init__(self, editwin):
+         if not editwin.runnable:
+             self.menudefs = []
+             self.keydefs = {}        
          self.editwin = editwin
          # Provide instance variables referenced by Debugger