diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2007-10-09 23:12:31 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2007-10-09 23:12:31 (GMT) |
| commit | 3e623ba3ec0e1fc0491cdf6487b42c652d616ca6 (patch) | |
| tree | b599dfd9efc5f1c523267a6f4fd05d922a7c46b8 /Lib/idlelib | |
| parent | e518bf3c49b9d43f99511516a36cd363649cc44e (diff) | |
| download | cpython-3e623ba3ec0e1fc0491cdf6487b42c652d616ca6.zip cpython-3e623ba3ec0e1fc0491cdf6487b42c652d616ca6.tar.gz cpython-3e623ba3ec0e1fc0491cdf6487b42c652d616ca6.tar.bz2 | |
Windows EOL sequence not converted correctly, encoding error.
Caused file save to fail. Bug 1130.
M idlelib/IOBinding.py
M idlelib/NEWS.txt
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/IOBinding.py | 6 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py index cde2dae..5a15995 100644 --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -242,7 +242,6 @@ class IOBinding: eol = r"(\r\n)|\n|\r" # \r\n (Windows), \n (UNIX), or \r (Mac) eol_re = re.compile(eol) - eol_convention = os.linesep # Default def loadfile(self, filename): try: @@ -389,9 +388,10 @@ class IOBinding: def writefile(self, filename): self.fixlastline() - chars = self.encode(self.text.get("1.0", "end-1c")) + text = self.text.get("1.0", "end-1c") if self.eol_convention != "\n": - chars = chars.replace("\n", self.eol_convention) + text = text.replace("\n", self.eol_convention) + chars = self.encode(self.text.get("1.0", "end-1c")) try: f = open(filename, "wb") f.write(chars) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index f0dee79..460b5b5 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,12 @@ +What's New in IDLE 3.0a2? +========================= + +*Release date: XX-XXX-2007* + +- Windows EOL sequence not converted correctly, encoding error. + Caused file save to fail. Bug 1130. + + What's New in IDLE 3.0a1? ========================= @@ -19,7 +28,7 @@ What's New in IDLE 3.0a1? What's New in IDLE 2.6a1? ========================= -*Release date: XX-XXX-200X* UNRELEASED +*Release date: XX-XXX-200X* UNRELEASED, but merged into 3.0a1 - Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented; mouse and cursor selection in ACWindow implemented; double Tab inserts |