traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Saving a file containing unicode failed.

This commit is contained in:
Kurt B. Kaiser 2007-09-01 19:47:39 +00:00
parent bbb809ee6f
commit 1963ad3126
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Lib/idlelib/IOBinding.py
View File

@ -11,11 +11,7 @@ from SimpleDialog import SimpleDialog
from idlelib.configHandler import idleConf from idlelib.configHandler import idleConf
try:
from codecs import BOM_UTF8 from codecs import BOM_UTF8
except ImportError:
# only available since Python 2.3
BOM_UTF8 = '\xef\xbb\xbf'
# Try setting the locale, so that we can find out # Try setting the locale, so that we can find out
# what encoding to use # what encoding to use
@ -111,17 +107,18 @@ class EncodingMessage(SimpleDialog):
def do_edit(self): def do_edit(self):
self.done(1) self.done(1)
def coding_spec(str): def coding_spec(data):
"""Return the encoding declaration according to PEP 263. """Return the encoding declaration according to PEP 263.
Raise LookupError if the encoding is declared but unknown. Raise LookupError if the encoding is declared but unknown.
""" """
# perform string manipulation in latin-1 if isinstance(data, bytes):
str = str.decode("latin-1") str = data.decode('utf-8')
else:
str = data
# Only consider the first two lines # Only consider the first two lines
str = str.split("\n")[:2] str = str.split("\n")[:2]
str = "\n".join(str) str = "\n".join(str)
match = coding_re.search(str) match = coding_re.search(str)
if not match: if not match:
return None return None
@ -239,12 +236,12 @@ class IOBinding:
# open the file in binary mode so that we can handle # open the file in binary mode so that we can handle
# end-of-line convention ourselves. # end-of-line convention ourselves.
f = open(filename,'rb') f = open(filename,'rb')
chars = f.read() bytes = f.read()
f.close() f.close()
except IOError as msg: except IOError as msg:
tkMessageBox.showerror("I/O Error", str(msg), master=self.text) tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
return False return False
chars = self.decode(chars) chars = self.decode(bytes)
# We now convert all end-of-lines to '\n's # We now convert all end-of-lines to '\n's
firsteol = self.eol_re.search(chars) firsteol = self.eol_re.search(chars)
if firsteol: if firsteol:
@ -274,7 +271,7 @@ class IOBinding:
return chars return chars
else: else:
# Indicates that this file originally had a BOM # Indicates that this file originally had a BOM
self.fileencoding = BOM_UTF8 self.fileencoding = 'BOM'
return chars return chars
# Next look for coding specification # Next look for coding specification
try: try:
@ -401,10 +398,10 @@ class IOBinding:
if failed: if failed:
tkMessageBox.showerror( tkMessageBox.showerror(
"I/O Error", "I/O Error",
"%s. Saving as UTF-8" % failed, "%s.\nSaving as UTF-8" % failed,
master = self.text) master = self.text)
# If there was a UTF-8 signature, use that. This should not fail # If there was a UTF-8 signature, use that. This should not fail
if self.fileencoding == BOM_UTF8 or failed: if self.fileencoding == 'BOM' or failed:
return BOM_UTF8 + chars.encode("utf-8") return BOM_UTF8 + chars.encode("utf-8")
# Try the original file encoding next, if any # Try the original file encoding next, if any
if self.fileencoding: if self.fileencoding: