diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /python/helpers/pydev/pydev_run_in_console.py | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'python/helpers/pydev/pydev_run_in_console.py')
| -rw-r--r-- | python/helpers/pydev/pydev_run_in_console.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/python/helpers/pydev/pydev_run_in_console.py b/python/helpers/pydev/pydev_run_in_console.py index 1b8e1d230175..731ead67115e 100644 --- a/python/helpers/pydev/pydev_run_in_console.py +++ b/python/helpers/pydev/pydev_run_in_console.py @@ -2,6 +2,7 @@ from pydevconsole import * import pydev_imports +from pydevd_utils import save_main_module def run_file(file, globals=None, locals=None): @@ -11,22 +12,8 @@ def run_file(file, globals=None, locals=None): file = new_target if globals is None: - # patch provided by: Scott Schlesier - when script is run, it does not - # use globals from pydevd: - # This will prevent the pydevd script from contaminating the namespace for the script to be debugged - - # pretend pydevd is not the main module, and - # convince the file to be debugged that it was loaded as main - sys.modules['pydevd'] = sys.modules['__main__'] - sys.modules['pydevd'].__name__ = 'pydevd' - - from imp import new_module - m = new_module('__main__') - sys.modules['__main__'] = m - if hasattr(sys.modules['pydevd'], '__loader__'): - setattr(m, '__loader__', getattr(sys.modules['pydevd'], '__loader__')) - - m.__file__ = file + m = save_main_module(file, 'pydev_run_in_console') + globals = m.__dict__ try: globals['__builtins__'] = __builtins__ |