Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
diff --git a/python/helpers/pydev/pydevd_vars.py b/python/helpers/pydev/pydevd_vars.py
index 0cc45f7..3baea5b 100644
--- a/python/helpers/pydev/pydevd_vars.py
+++ b/python/helpers/pydev/pydevd_vars.py
@@ -3,10 +3,12 @@
"""
import pickle
from django_frame import DjangoTemplateFrame
+from pydevd_constants import * #@UnusedWildImport
from types import * #@UnusedWildImport
from pydevd_custom_frames import getCustomFrame
from pydevd_xml import *
+from _pydev_imps import _pydev_thread
try:
from StringIO import StringIO
@@ -14,13 +16,10 @@
from io import StringIO
import sys #@Reimport
-if USE_LIB_COPY:
- import _pydev_threading as threading
-else:
- import threading
+import _pydev_threading as threading
import traceback
import pydevd_save_locals
-from pydev_imports import Exec, execfile
+from pydev_imports import Exec, quote, execfile
try:
import types
@@ -69,7 +68,7 @@
# AdditionalFramesContainer
#===============================================================================
class AdditionalFramesContainer:
- lock = threading.Lock()
+ lock = _pydev_thread.allocate_lock()
additional_frames = {} #dict of dicts