[pyrepl-checkins] pyrepl/pyrepl python_reader.py,1.12,1.13

[mwh@codespeak.net]

Update of /cvs/pyrepl/pyrepl/pyrepl
In directory thoth.codespeak.net:/tmp/cvs-serv986

Modified Files:
	python_reader.py 
Log Message:
Tweaks for cocoa support (which isn't getting checked in today).


Index: python_reader.py
===================================================================
RCS file: /cvs/pyrepl/pyrepl/pyrepl/python_reader.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** python_reader.py	15 Oct 2003 12:27:09 -0000	1.12
--- python_reader.py	14 Mar 2004 14:09:57 -0000	1.13
***************
*** 175,179 ****
                          sv = warnings.showwarning
                          warnings.showwarning = eat_it
!                         l = self.reader.readline()
                      finally:
                          warnings.showwarning = sv
--- 175,179 ----
                          sv = warnings.showwarning
                          warnings.showwarning = eat_it
!                         l = unicode(self.reader.readline(), 'utf-8')
                      finally:
                          warnings.showwarning = sv
***************
*** 200,204 ****
      def handle1(self, block=1):
          try:
!             self.reader.handle1(block)
          except KeyboardInterrupt:
              self.restore()
--- 200,205 ----
      def handle1(self, block=1):
          try:
!             r = 1
!             r = self.reader.handle1(block)
          except KeyboardInterrupt:
              self.restore()
***************
*** 212,215 ****
--- 213,217 ----
                      self.execute(text)
                  self.prepare()
+         return r
  
      def tkfilehandler(self, file, mask):
***************
*** 226,229 ****
--- 228,232 ----
              self.reader.console.input_fd, _tkinter.READABLE,
              self.tkfilehandler)
+         
          self.exc_info = None
          while 1:
***************
*** 285,289 ****
                  break
  
! def main(use_pygame_console=0):
      si, se, so = sys.stdin, sys.stderr, sys.stdout
      try:
--- 288,299 ----
                  break
  
!     def cocoainteract(self, inputfilehandle=None, outputfilehandle=None):
!         # only call this when there's a run loop already going!
!         # note that unlike the other *interact methods, this returns immediately
!         from cocoasupport import CocoaInteracter
!         self.cocoainteracter = CocoaInteracter.alloc().init(self, inputfilehandle, outputfilehandle)
!         
!         
! def main(use_pygame_console=0, interactmethod="interact"):
      si, se, so = sys.stdin, sys.stderr, sys.stdout
      try:
***************
*** 333,337 ****
          rc = ReaderConsole(con, mainmod.__dict__)
          rc.run_user_init_file()
!         rc.tkinteract()
      finally:
          sys.stdin, sys.stderr, sys.stdout = si, se, so
--- 343,347 ----
          rc = ReaderConsole(con, mainmod.__dict__)
          rc.run_user_init_file()
!         getattr(rc, interactmethod)()
      finally:
          sys.stdin, sys.stderr, sys.stdout = si, se, so