From: Kurt B. Kaiser <kbk@shore.net>
Date: Fri, 27 Sep 2002 00:34:31 +0000 (+0000)
Subject: Revert Rev 1.6
X-Git-Tag: v2.3c1~3967
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46466b4c9228de804521e94df48e58490a35466e;p=thirdparty%2FPython%2Fcpython.git

Revert Rev 1.6
"Merge Py Idle changes:
Rev 1.7 [Python-idle] loewis
Convert characters from the locale's encoding on output.
Reject characters outside the locale's encoding on input."

Not compatible with Python 2.2.1.  Forwardport as a SF patch.
---

diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
index 181238fea7c0..7522720c29e1 100644
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -2,7 +2,6 @@ from Tkinter import *
 from EditorWindow import EditorWindow
 import re
 import tkMessageBox
-import IOBinding
 
 class OutputWindow(EditorWindow):
 
@@ -35,14 +34,6 @@ class OutputWindow(EditorWindow):
     # Act as output file
 
     def write(self, s, tags=(), mark="insert"):
-        # Tk assumes that byte strings are Latin-1;
-        # we assume that they are in the locale's encoding
-        if isinstance(s, str):
-            try:
-                s = unicode(s, IOBinding.encoding)
-            except UnicodeError:
-                # some other encoding; let Tcl deal with it
-                pass
         self.text.insert(mark, s, tags)
         self.text.see(mark)
         self.text.update()