summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/OutputWindow.py
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2007-08-12 01:52:35 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2007-08-12 01:52:35 (GMT)
commitcbbe98f04fb03922ff2e3b6bf35769cf63673153 (patch)
treebc153d343fef9fea56430ff9456236027b3dea9b /Lib/idlelib/OutputWindow.py
parent801c89be5dbf90defc492d9b81d6dec8e8a1a16a (diff)
downloadcpython-cbbe98f04fb03922ff2e3b6bf35769cf63673153.zip
cpython-cbbe98f04fb03922ff2e3b6bf35769cf63673153.tar.gz
cpython-cbbe98f04fb03922ff2e3b6bf35769cf63673153.tar.bz2
1. Catch TypeError exception when writing to OutputWindow
2. PyShell: shell isn't working due to encoding issues. Temporarily direct exceptions to the terminal. Also, trap exceptions occurring during write() instead of passing. Checking (2) in temporarily to aid finding the encoding problem in IOBinding.py
Diffstat (limited to 'Lib/idlelib/OutputWindow.py')
-rw-r--r--Lib/idlelib/OutputWindow.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
index ef155a4..4c07c03 100644
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -40,6 +40,8 @@ class OutputWindow(EditorWindow):
if isinstance(s, str):
try:
s = str(s, IOBinding.encoding)
+ except TypeError:
+ raise
except UnicodeError:
# some other encoding; let Tcl deal with it
pass