[Idle-dev] CVS: idle IOBinding.py,1.18,1.19 NEWS.txt,1.25,1.26

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv6394

Modified Files:
	IOBinding.py NEWS.txt 
Log Message:
Port Martin v. Loewis corrections to IOBinding.py (1.20, 1.21) from
Python IDLE.  Closes IDLEfork Bug 778547, Python Bugs 788378, 774680,
805728

M IOBinding.py
M NEWS.txt


Index: IOBinding.py
===================================================================
RCS file: /cvsroot/idlefork/idle/IOBinding.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** IOBinding.py	9 Jun 2003 03:12:42 -0000	1.18
--- IOBinding.py	25 Nov 2003 04:52:11 -0000	1.19
***************
*** 30,34 ****
      import locale
      locale.setlocale(locale.LC_CTYPE, "")
! except ImportError:
      pass
  
--- 30,34 ----
      import locale
      locale.setlocale(locale.LC_CTYPE, "")
! except (ImportError, locale.Error):
      pass
  
***************
*** 253,256 ****
--- 253,259 ----
          if firsteol:
              self.eol_convention = firsteol.group(0)
+             if isinstance(self.eol_convention, unicode):
+                 # Make sure it is an ASCII string
+                 self.eol_convention = self.eol_convention.encode("ascii")
              chars = self.eol_re.sub(r"\n", chars)
  

Index: NEWS.txt
===================================================================
RCS file: /cvsroot/idlefork/idle/NEWS.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** NEWS.txt	25 Nov 2003 03:42:32 -0000	1.25
--- NEWS.txt	25 Nov 2003 04:52:12 -0000	1.26
***************
*** 8,11 ****
--- 8,14 ----
  *Release date: XX-XXX-2003*
  
+ - Port Martin v. Loewis corrections to IOBinding.py (1.20, 1.21) from Python
+   IDLE.  Closes IDLEfork Bug 778547, Python Bugs 788378, 774680, 805728
+ 
  - Keybindings with the Shift modifier now work correctly.  So do bindings which
    use the Space key.  Limit unmodified user keybindings to the function keys.