From be4d57af720ef036b0a284c817521bcff3d90dad Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Thu, 6 Apr 2017 21:09:56 +0300 Subject: [PATCH] Fix deadlock on importing with Remote Debug Server (PY-23568) --- python/helpers/pydev/pydevd.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/helpers/pydev/pydevd.py b/python/helpers/pydev/pydevd.py index ee02bf6acb99..2c7eaaaa1cee 100644 --- a/python/helpers/pydev/pydevd.py +++ b/python/helpers/pydev/pydevd.py @@ -35,7 +35,7 @@ from _pydevd_bundle.pydevd_comm import CMD_SET_BREAK, CMD_SET_NEXT_STATEMENT, CM from _pydevd_bundle.pydevd_custom_frames import CustomFramesContainer, custom_frames_container_init from _pydevd_bundle.pydevd_frame_utils import add_exception_to_frame from _pydevd_bundle.pydevd_kill_all_pydevd_threads import kill_all_pydev_threads -from _pydevd_bundle.pydevd_trace_dispatch import trace_dispatch as _trace_dispatch +from _pydevd_bundle.pydevd_trace_dispatch import trace_dispatch as _trace_dispatch, global_cache_skips, global_cache_frame_skips from _pydevd_frame_eval.pydevd_frame_eval_main import frame_eval_func, stop_frame_eval, set_use_code_extra from _pydevd_bundle.pydevd_utils import save_main_module from pydevd_concurrency_analyser.pydevd_concurrency_logger import ThreadingLogger, AsyncioLogger, send_message, cur_time @@ -586,7 +586,6 @@ class PyDB: def consolidate_breakpoints(self, file, id_to_breakpoint, breakpoints): - from _pydevd_bundle.pydevd_trace_dispatch import global_cache_skips, global_cache_frame_skips break_dict = {} for breakpoint_id, pybreakpoint in dict_iter_items(id_to_breakpoint): break_dict[pybreakpoint.line] = pybreakpoint