summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2005-08-23 17:38:56 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2005-08-23 17:38:56 (GMT)
commit61e7ce8b834f3777da38c06a4718d0bb0e522248 (patch)
tree7f663dae04899728a108718ca47fe652d3a8ca23
parent08be9dcb75ea9daa05548c5c931eed86ec538257 (diff)
downloadcpython-61e7ce8b834f3777da38c06a4718d0bb0e522248.zip
cpython-61e7ce8b834f3777da38c06a4718d0bb0e522248.tar.gz
cpython-61e7ce8b834f3777da38c06a4718d0bb0e522248.tar.bz2
- 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
-rw-r--r--Lib/idlelib/NEWS.txt9
-rw-r--r--Lib/idlelib/ScriptBinding.py1
2 files changed, 10 insertions, 0 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 17cb2d8..7504cd0 100644
--- 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 8ad02a4..30adaab 100644
--- 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