Commits

Andrew Svetlov committed 8987880

Issue #14200 — now displayhook for IDLE works in non-subprocess mode as well as subprecess.

Comments (0)

Files changed (3)

Lib/idlelib/PyShell.py

                 return False
         else:
             nosub = "==== No Subprocess ===="
+            sys.displayhook = rpc.displayhook
+
         self.write("Python %s on %s\n%s\n%s" %
                    (sys.version, sys.platform, self.COPYRIGHT, nosub))
         self.showprompt()

Lib/idlelib/rpc.py

 import copyreg
 import types
 import marshal
+import builtins
 
 
 def unpickle_code(ms):
 
 # 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

Lib/idlelib/run.py

 import _thread as thread
 import threading
 import queue
-import builtins
 
 from idlelib import CallTips
 from idlelib import AutoComplete
             thread.interrupt_main()
 
 
-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
-
-
 class MyHandler(rpc.RPCHandler):
 
     def handle(self):
         sys.stdin = self.console = self.get_remote_proxy("stdin")
         sys.stdout = self.get_remote_proxy("stdout")
         sys.stderr = self.get_remote_proxy("stderr")
-        sys.displayhook = displayhook
+        sys.displayhook = rpc.displayhook
         # page help() text to shell.
         import pydoc # import must be done here to capture i/o binding
         pydoc.pager = pydoc.plainpager