Windows EOL sequence not converted correctly, encoding error.

Caused file save to fail. Bug 1130.

M    idlelib/IOBinding.py
M    idlelib/NEWS.txt
This commit is contained in:
Kurt B. Kaiser 2007-10-09 23:12:31 +00:00
parent e518bf3c49
commit 3e623ba3ec
2 changed files with 13 additions and 4 deletions

View File

@ -242,7 +242,6 @@ class IOBinding:
eol = r"(\r\n)|\n|\r" # \r\n (Windows), \n (UNIX), or \r (Mac) eol = r"(\r\n)|\n|\r" # \r\n (Windows), \n (UNIX), or \r (Mac)
eol_re = re.compile(eol) eol_re = re.compile(eol)
eol_convention = os.linesep # Default
def loadfile(self, filename): def loadfile(self, filename):
try: try:
@ -389,9 +388,10 @@ class IOBinding:
def writefile(self, filename): def writefile(self, filename):
self.fixlastline() 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": 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: try:
f = open(filename, "wb") f = open(filename, "wb")
f.write(chars) f.write(chars)

View File

@ -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? 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? 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; - Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts mouse and cursor selection in ACWindow implemented; double Tab inserts