From d4c1dc28f3f57d3904e3b14b906dbedb253933b7 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Fri, 18 May 2018 08:55:45 +0300 Subject: [PATCH] PY-18029 Fix-up for initial pydev console changes --- .../_pydev_bundle/pydev_console_utils.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py b/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py index 8b0cb7c0a5f4..695a5576e194 100644 --- a/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py +++ b/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py @@ -584,7 +584,7 @@ class BaseInterpreterInterface: else: return self.orig_find_frame(thread_id, frame_id) - def connectToDebugger(self, debuggerPort, debugger_options=None): + def connectToDebugger(self, debuggerPort, debugger_options=None, extra_envs=None): ''' Used to show console with variables connection. Mainly, monkey-patches things in the debugger structure so that the debugger protocol works. @@ -592,18 +592,15 @@ class BaseInterpreterInterface: if debugger_options is None: debugger_options = {} - env_key = "PYDEVD_EXTRA_ENVS" - if env_key in debugger_options: - for (env_name, value) in dict_iter_items(debugger_options[env_key]): - existing_value = os.environ.get(env_name, None) - if existing_value: - os.environ[env_name] = "%s%c%s" % (existing_value, os.path.pathsep, value) - else: - os.environ[env_name] = value - if env_name == "PYTHONPATH": - sys.path.append(value) - del debugger_options[env_key] + for (env_name, value) in dict_iter_items(extra_envs): + existing_value = os.environ.get(env_name, None) + if existing_value: + os.environ[env_name] = "%s%c%s" % (existing_value, os.path.pathsep, value) + else: + os.environ[env_name] = value + if env_name == "PYTHONPATH": + sys.path.append(value) def do_connect_to_debugger(): try: