[pywin32-checkins] pywin32/Pythonwin/pywin/idle AutoIndent.py, 1.3.2.5, 1.3.2.6 PyParse.py, 1.5.2.1, 1.5.2.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/idle
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14888/Pythonwin/pywin/idle

Modified Files:
      Tag: py3k
	AutoIndent.py PyParse.py 
Log Message:
Merge various changes from trunk and py3k-integration bzr branch

Index: PyParse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/idle/PyParse.py,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** PyParse.py	29 Aug 2008 06:16:42 -0000	1.5.2.1
--- PyParse.py	26 Nov 2008 07:17:38 -0000	1.5.2.2
***************
*** 114,130 ****
      def set_str(self, str):
          assert len(str) == 0 or str[-1] == '\n', "Oops - have str %r" % (str,)
- ##        if type(str) == UnicodeType:
- ##            # The parse functions have no idea what to do with Unicode, so
- ##            # replace all Unicode characters with "x".  This is "safe"
- ##            # so long as the only characters germane to parsing the structure
- ##            # of Python are 7-bit ASCII.  It's *necessary* because Unicode
- ##            # strings don't have a .translate() method that supports
- ##            # deletechars.
- ##            uniphooey = str
- ##            str = []
- ##            push = str.append
- ##            for raw in map(ord, uniphooey):
- ##                push(raw < 127 and chr(raw) or "x")
- ##            str = "".join(str)
          self.str = str
          self.study_level = 0
--- 114,117 ----

Index: AutoIndent.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/idle/AutoIndent.py,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -d -r1.3.2.5 -r1.3.2.6
*** AutoIndent.py	24 Sep 2008 21:04:39 -0000	1.3.2.5
--- AutoIndent.py	26 Nov 2008 07:17:38 -0000	1.3.2.6
***************
*** 480,489 ****
      def readline(self):
          if self.finished:
!             return ""
!         i = self.i = self.i + 1
!         mark = repr(i) + ".0"
!         if self.text.compare(mark, ">=", "end"):
!             return b""
!         return self.text.get(mark, mark + " lineend+1c").encode(default_scintilla_encoding)
  
      def run(self):
--- 480,492 ----
      def readline(self):
          if self.finished:
!             val = ""
!         else:
!             i = self.i = self.i + 1
!             mark = repr(i) + ".0"
!             if self.text.compare(mark, ">=", "end"):
!                 val = ""
!             else:
!                 val = self.text.get(mark, mark + " lineend+1c")
!         return val.encode(default_scintilla_encoding)
  
      def run(self):