[Idle-dev] CVS: idle PyShell.py,1.13.2.3,1.13.2.4

[Guido van Rossum]

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

Modified Files:
      Tag: DS_RPC_BRANCH
	PyShell.py 
Log Message:
Quick fix to make this work again after the autoindent extension was
merged into EditorWindow.py: self.auto.foo becomes self.foo, and
self.auto disappears.


Index: PyShell.py
===================================================================
RCS file: /cvsroot/idlefork/idle/PyShell.py,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -r1.13.2.3 -r1.13.2.4
*** PyShell.py	6 Aug 2002 00:42:08 -0000	1.13.2.3
--- PyShell.py	5 Sep 2002 02:54:34 -0000	1.13.2.4
***************
*** 316,321 ****
          __builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D."
  
!         self.auto = self.extensions["AutoIndent"] # Required extension
!         self.auto.config(usetabs=1, indentwidth=8, context_use_ps1=1)
  
          text = self.text
--- 316,320 ----
          __builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D."
  
!         self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
  
          text = self.text
***************
*** 424,428 ****
          self.interp = None
          self.console = None
-         self.auto = None
          self.flist.pyshell = None
          self.history = None
--- 423,426 ----
***************
*** 529,533 ****
              self.text.see("insert")
          else:
!             self.auto.auto_indent(event)
          return "break"
  
--- 527,531 ----
              self.text.see("insert")
          else:
!             self.auto_indent(event)
          return "break"
  
***************
*** 569,573 ****
          # insert a newline right at the insert point
          if self.text.compare("insert", "<", "end-1c linestart"):
!             self.auto.auto_indent(event)
              return "break"
          # We're in the last line; append a newline and submit it
--- 567,571 ----
          # insert a newline right at the insert point
          if self.text.compare("insert", "<", "end-1c linestart"):
!             self.auto_indent(event)
              return "break"
          # We're in the last line; append a newline and submit it
***************
*** 577,581 ****
              self.text.see("insert")
          else:
!             self.auto.auto_indent(event)
          self.text.tag_add("stdin", "iomark", "end-1c")
          self.text.update_idletasks()
--- 575,579 ----
              self.text.see("insert")
          else:
!             self.auto_indent(event)
          self.text.tag_add("stdin", "iomark", "end-1c")
          self.text.update_idletasks()