Snapshot idea/138.2210 from git://git.jetbrains.org/idea/community.git
Change-Id: I8f0204d7887ee78cf1fd8c09f936c5afff0edd2f
diff --git a/python/helpers/pydev/pydevconsole.py b/python/helpers/pydev/pydevconsole.py
index 8d4375f..444aa2d 100644
--- a/python/helpers/pydev/pydevconsole.py
+++ b/python/helpers/pydev/pydevconsole.py
@@ -80,10 +80,18 @@
from pydev_imports import execfile
__builtin__.execfile = execfile
-
except:
pass
+# Pull in runfile, the interface to UMD that wraps execfile
+from pydev_umd import runfile, _set_globals_function
+try:
+ import builtins
+ builtins.runfile = runfile
+except:
+ import __builtin__
+ __builtin__.runfile = runfile
+
#=======================================================================================================================
# InterpreterInterface
@@ -264,6 +272,9 @@
sys.stderr.write('Error starting server with host: %s, port: %s, client_port: %s\n' % (host, port, client_port))
raise
+ # Tell UMD the proper default namespace
+ _set_globals_function(interpreter.getNamespace)
+
server.register_function(interpreter.execLine)
server.register_function(interpreter.execMultipleLines)
server.register_function(interpreter.getCompletions)