mirrors/debugpy
1
0
Fork 0
mirror of https://github.com/microsoft/debugpy.git synced 2025-12-23 08:48:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Work around import deadlock in enable_attach() on Python 2 (#1788).

Browse source
This commit is contained in:
Pavel Minaev 2019-09-20 12:44:55 -07:00 • committed by Pavel Minaev
parent 8efec2b3f6
commit 3908192ce7
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/DEBUGGEE_PYTHONPATH/debug_me/__init__.py
View file

@ -20,7 +20,9 @@ both as global variables, specifically so that it is possible to write::
__all__ = ["ptvsd", "pydevd", "session_id"]
import imp
import os
import sys
# For `from debug_me import ...`.
import ptvsd
@ -47,8 +49,16 @@ if _code:
del os.environ["PTVSD_DEBUG_ME"]
_code = compile(_code, "<PTVSD_DEBUG_ME>", "exec")
eval(_code, {})
# On Python 2, imports use a global import lock, which deadlocks enable_attach()
# when it tries to import from a background thread. This works around that.
if sys.version_info < (3,):
imp.release_lock()
try:
eval(_code, {})
finally:
if sys.version_info < (3,):
imp.acquire_lock()
# For non-blocking communication between the test and the debuggee. The debuggee
# can access this as a normal dict - scratchpad["foo"] etc. The test should assign