summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/rpc.py
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-25 08:43:02 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-25 08:43:02 (GMT)
commitcd49d5323833ff15cc10a918bdb2afcb02e500a4 (patch)
tree49580ece73a971a467b39ed4fbfc1af6fd71d7cf /Lib/idlelib/rpc.py
parent1a7742eb4d7960c72fc1be794c988d648e5ef139 (diff)
downloadcpython-cd49d5323833ff15cc10a918bdb2afcb02e500a4.zip
cpython-cd49d5323833ff15cc10a918bdb2afcb02e500a4.tar.gz
cpython-cd49d5323833ff15cc10a918bdb2afcb02e500a4.tar.bz2
Issue #14200 — now displayhook for IDLE works in non-subprocess mode as well as subprecess.
Diffstat (limited to 'Lib/idlelib/rpc.py')
-rw-r--r--Lib/idlelib/rpc.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 301305e..77cb3ac 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -40,6 +40,7 @@ import traceback
import copyreg
import types
import marshal
+import builtins
def unpickle_code(ms):
@@ -603,3 +604,21 @@ class MethodProxy(object):
# XXX KBK 09Sep03 We need a proper unit test for this module. Previously
# existing test code was removed at Rev 1.27 (r34098).
+
+def displayhook(value):
+ """Override standard display hook to use non-locale encoding"""
+ if value is None:
+ return
+ # Set '_' to None to avoid recursion
+ builtins._ = None
+ text = repr(value)
+ try:
+ sys.stdout.write(text)
+ except UnicodeEncodeError:
+ # let's use ascii while utf8-bmp codec doesn't present
+ encoding = 'ascii'
+ bytes = text.encode(encoding, 'backslashreplace')
+ text = bytes.decode(encoding, 'strict')
+ sys.stdout.write(text)
+ sys.stdout.write("\n")
+ builtins._ = value