- Mac line endings were incorrect when pasting code from some browsers

  when using X11 and the Fink distribution.  Python Bug 1263656.
Modified Files:
   Tag: release24-maint
 	NEWS.txt ScriptBinding.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 17cb2d85012c9857686d9d47b092e86bf033498b..7504cd0d8af1dceb717174b5f769cea2de8463e1 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,12 @@
+What's New in IDLE 1.1.2c1?
+=========================
+
+*Release date: XX-SEP-2005*
+
+- Mac line endings were incorrect when pasting code from some browsers
+  when using X11 and the Fink distribution.  Python Bug 1263656.
+
+
 What's New in IDLE 1.1.1?
 =========================
 

diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index 8ad02a43f222c332751049b3a3dba0ee330f2193..30adaab28b0ede3312e1df60454aa51a8867dc26 100644 (file)
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -90,6 +90,7 @@ class ScriptBinding:
         f.close()
         if '\r' in source:
             source = re.sub(r"\r\n", "\n", source)
+            source = re.sub(r"\r", "\n", source)
         if source and source[-1] != '\n':
             source = source + '\n'
         text = self.editwin.text