From: Martin v. Löwis Date: Sat, 10 Aug 2002 12:22:12 +0000 (+0000) Subject: Convert characters from the locale's encoding on output. X-Git-Tag: v2.3c1~4556 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75ea1e11dcb90c768af6a222ae8e20a4f532617d;p=python Convert characters from the locale's encoding on output. Reject characters outside the locale's encoding on input. --- diff --git a/Tools/idle/OutputWindow.py b/Tools/idle/OutputWindow.py index f429f2e8bf..0e7fba231a 100644 --- a/Tools/idle/OutputWindow.py +++ b/Tools/idle/OutputWindow.py @@ -2,6 +2,7 @@ from Tkinter import * from EditorWindow import EditorWindow import re import tkMessageBox +import IOBinding class OutputWindow(EditorWindow): @@ -34,6 +35,14 @@ 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() diff --git a/Tools/idle/PyShell.py b/Tools/idle/PyShell.py index 31a89402cf..e71a9a17a5 100644 --- a/Tools/idle/PyShell.py +++ b/Tools/idle/PyShell.py @@ -191,7 +191,12 @@ class ModifiedInterpreter(InteractiveInterpreter): warnings.filterwarnings(action="error", category=SyntaxWarning) if isinstance(source, types.UnicodeType): import IOBinding - source = source.encode(IOBinding.encoding) + try: + source = source.encode(IOBinding.encoding) + except UnicodeError: + self.tkconsole.resetoutput() + self.write("Unsupported characters in input") + return try: return InteractiveInterpreter.runsource(self, source, filename) finally: