Author: martin.v.loewis
Date: Mon Aug 13 15:30:04 2007
New Revision: 56985
Modified:
python/branches/py3k/Lib/idlelib/IOBinding.py
Log:
Enable basic load/store again.
Modified: python/branches/py3k/Lib/idlelib/IOBinding.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/IOBinding.py (original)
+++ python/branches/py3k/Lib/idlelib/IOBinding.py Mon Aug 13 15:30:04 2007
@@ -123,6 +123,8 @@
Raise LookupError if the encoding is declared but unknown.
"""
+ # perform string manipulation in latin-1
+ str = str.decode("latin-1")
# Only consider the first two lines
str = str.split("\n")[:2]
str = "\n".join(str)
@@ -386,7 +388,7 @@
return False
def encode(self, chars):
- if isinstance(chars, types.StringType):
+ if isinstance(chars, bytes):
# This is either plain ASCII, or Tk was returning mixed-encoding
# text to us. Don't try to guess further.
return chars
@@ -544,8 +546,6 @@
self.savedialog = tkFileDialog.SaveAs(master=self.text,
filetypes=self.filetypes)
filename = self.savedialog.show(initialdir=dir, initialfile=base)
- if isinstance(filename, str):
- filename = filename.encode(filesystemencoding)
return filename
def updaterecentfileslist(self,filename):
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
