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

Fix inconsistencies in handling files. Fixes https://github.com/microsoft/ptvsd/issues/1636

Browse source
This commit is contained in:
Fabio Zadrozny 2020-03-09 10:09:51 -03:00 • committed by Pavel Minaev
parent 30931d560e
commit 935c118a1c
9 changed files with 134 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_dont_trace_files.py
View file

@ -8,6 +8,20 @@ from _pydevd_bundle.pydevd_constants import IS_PY3K
LIB_FILE = 1
PYDEV_FILE = 2
DONT_TRACE_DIRS = {
'_pydev_bundle': PYDEV_FILE,
'_pydev_imps': PYDEV_FILE,
'_pydev_runfiles': PYDEV_FILE,
'_pydevd_bundle': PYDEV_FILE,
'_pydevd_frame_eval': PYDEV_FILE,
'pydev_ipython': PYDEV_FILE,
'pydev_sitecustomize': PYDEV_FILE,
'pydevd_attach_to_process': PYDEV_FILE,
'pydevd_concurrency_analyser': PYDEV_FILE,
'pydevd_plugins': PYDEV_FILE,
'test_pydevd_reload': PYDEV_FILE,
}
DONT_TRACE = {
# commonly used things from the stdlib that we don't want to trace
'Queue.py':LIB_FILE,
@ -55,6 +69,14 @@ DONT_TRACE = {
'pydev_monkey_qt.py': PYDEV_FILE,
'pydev_override.py': PYDEV_FILE,
'pydev_run_in_console.py': PYDEV_FILE,
'pydev_runfiles.py': PYDEV_FILE,
'pydev_runfiles_coverage.py': PYDEV_FILE,
'pydev_runfiles_nose.py': PYDEV_FILE,
'pydev_runfiles_parallel.py': PYDEV_FILE,
'pydev_runfiles_parallel_client.py': PYDEV_FILE,
'pydev_runfiles_pytest2.py': PYDEV_FILE,
'pydev_runfiles_unittest.py': PYDEV_FILE,
'pydev_runfiles_xml_rpc.py': PYDEV_FILE,
'pydev_umd.py': PYDEV_FILE,
'pydev_versioncheck.py': PYDEV_FILE,
'pydevconsole.py': PYDEV_FILE,

15
src/debugpy/_vendored/pydevd/build_tools/generate_code.py
View file

@ -108,6 +108,10 @@ from _pydevd_bundle.pydevd_constants import IS_PY3K
LIB_FILE = 1
PYDEV_FILE = 2
DONT_TRACE_DIRS = {
%(pydev_dirs)s
}
DONT_TRACE = {
# commonly used things from the stdlib that we don't want to trace
'Queue.py':LIB_FILE,
@ -135,8 +139,13 @@ if IS_PY3K:
'''
pydev_files = []
pydev_dirs = []
for root, dirs, files in os.walk(root_dir):
for d in dirs:
if 'pydev' in d:
pydev_dirs.append(" '%s': PYDEV_FILE," % (d,))
for d in [
'.git',
'.settings',
@ -154,7 +163,6 @@ if IS_PY3K:
'test_pydevd_reload',
'third_party',
'__pycache__',
'_pydev_runfiles',
'pydev_ipython',
]:
try:
@ -176,7 +184,10 @@ if IS_PY3K:
):
pydev_files.append(" '%s': PYDEV_FILE," % (f,))
contents = template % (dict(pydev_files='\n'.join(sorted(pydev_files))))
contents = template % (dict(
pydev_files='\n'.join(sorted(pydev_files)),
pydev_dirs='\n'.join(sorted(pydev_dirs)),
))
assert 'pydevd.py' in contents
assert 'pydevd_dont_trace.py' in contents
with open(os.path.join(root_dir, '_pydevd_bundle', 'pydevd_dont_trace_files.py'), 'w') as stream:

24
src/debugpy/_vendored/pydevd/pydevd.py
View file

@ -43,7 +43,7 @@ from _pydevd_bundle.pydevd_constants import (IS_JYTH_LESS25, get_thread_id, get_
ForkSafeLock)
from _pydevd_bundle.pydevd_defaults import PydevdCustomization # Note: import alias used on pydev_monkey.
from _pydevd_bundle.pydevd_custom_frames import CustomFramesContainer, custom_frames_container_init
from _pydevd_bundle.pydevd_dont_trace_files import DONT_TRACE, PYDEV_FILE, LIB_FILE
from _pydevd_bundle.pydevd_dont_trace_files import DONT_TRACE, PYDEV_FILE, LIB_FILE, DONT_TRACE_DIRS
from _pydevd_bundle.pydevd_extension_api import DebuggerEventHandler
from _pydevd_bundle.pydevd_frame_utils import add_exception_to_frame, remove_exception_from_frame
from _pydevd_bundle.pydevd_net_command_factory_xml import NetCommandFactory
@ -605,6 +605,7 @@ class PyDB(object):
self.collect_return_info = collect_return_info
self.get_exception_breakpoint = get_exception_breakpoint
self._dont_trace_get_file_type = DONT_TRACE.get
self._dont_trace_dirs_get_file_type = DONT_TRACE_DIRS.get
self.PYDEV_FILE = PYDEV_FILE
self.LIB_FILE = LIB_FILE
@ -750,7 +751,25 @@ class PyDB(object):
if abs_real_path_and_basename[0].startswith(('<builtin', '<attrs')):
# In PyPy "<builtin> ..." can appear and should be ignored for the user.
return self.PYDEV_FILE
return self._dont_trace_get_file_type(basename)
file_type = self._dont_trace_get_file_type(basename)
if file_type is not None:
return file_type
if basename.startswith('__init__.py'):
# i.e.: ignore the __init__ files inside pydevd (the other
# files are ignored just by their name).
abs_path = abs_real_path_and_basename[0]
i = max(abs_path.rfind('/'), abs_path.rfind('\\'))
if i:
abs_path = abs_path[0:i]
i = max(abs_path.rfind('/'), abs_path.rfind('\\'))
if i:
dirname = abs_path[i + 1:]
# At this point, something as:
# "my_path\_pydev_runfiles\__init__.py"
# is now "_pydev_runfiles".
return self._dont_trace_dirs_get_file_type(dirname)
return None
def dont_trace_external_files(self, abs_path):
'''
@ -837,6 +856,7 @@ class PyDB(object):
if file_type is None:
if self.dont_trace_external_files(abs_real_path_and_basename[0]):
file_type = PYDEV_FILE
_cache_file_type[cache_key] = file_type
return file_type

21
src/debugpy/_vendored/pydevd/pydevd_file_utils.py
View file

@ -747,10 +747,15 @@ setup_client_server_paths(PATHS_FROM_ECLIPSE_TO_PYTHON)
# For given file f returns tuple of its absolute path, real path and base name
def get_abs_path_real_path_and_base_from_file(
f, NORM_PATHS_AND_BASE_CONTAINER=NORM_PATHS_AND_BASE_CONTAINER):
filename, NORM_PATHS_AND_BASE_CONTAINER=NORM_PATHS_AND_BASE_CONTAINER):
try:
return NORM_PATHS_AND_BASE_CONTAINER[f]
return NORM_PATHS_AND_BASE_CONTAINER[filename]
except:
f = filename
if not f:
# i.e.: it's possible that the user compiled code with an empty string (consider
# it as <string> in this case).
f = '<string>'
if _NormPaths is None: # Interpreter shutdown
i = max(f.rfind('/'), f.rfind('\\'))
return (f, f, f[i + 1:])
@ -770,7 +775,7 @@ def get_abs_path_real_path_and_base_from_file(
i = max(f.rfind('/'), f.rfind('\\'))
base = f[i + 1:]
ret = abs_path, real_path, base
NORM_PATHS_AND_BASE_CONTAINER[f] = ret
NORM_PATHS_AND_BASE_CONTAINER[filename] = ret
return ret
@ -784,8 +789,14 @@ def get_abs_path_real_path_and_base_from_frame(frame):
# files from eggs in Python 2.7 have paths like build/bdist.linux-x86_64/egg/<path-inside-egg>
f = frame.f_globals['__file__']
if get_abs_path_real_path_and_base_from_file is None: # Interpreter shutdown
return f
if get_abs_path_real_path_and_base_from_file is None:
# Interpreter shutdown
if not f:
# i.e.: it's possible that the user compiled code with an empty string (consider
# it as <string> in this case).
f = '<string>'
i = max(f.rfind('/'), f.rfind('\\'))
return f, f, f[i + 1:]
ret = get_abs_path_real_path_and_base_from_file(f)
# Also cache based on the frame.f_code.co_filename (if we had it inside build/bdist it can make a difference).

1
src/debugpy/_vendored/pydevd/tests_python/resources/my_code/my_code_on_entry.py Normal file
View file

@ -0,0 +1 @@
print('my code on entry')

0
src/debugpy/_vendored/pydevd/tests_python/resources/not_my_code/empty_file.py Normal file
View file

7
src/debugpy/_vendored/pydevd/tests_python/resources/not_my_code/main_on_entry.py Normal file
View file

@ -0,0 +1,7 @@
if __name__ == '__main__':
import sys
import os
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
from my_code import my_code_on_entry
print('TEST SUCEEDED')

7
src/debugpy/_vendored/pydevd/tests_python/resources/not_my_code/main_on_entry2.py Normal file
View file

@ -0,0 +1,7 @@
if __name__ == '__main__':
import sys
import os
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
import empty_file
print('TEST SUCEEDED')

47
src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py
View file

@ -134,7 +134,8 @@ class JsonFacade(object):
if isinstance(path, bytes):
path = path.decode('utf-8')
assert path.endswith(file)
if not path.endswith(file):
raise AssertionError('Expected path: %s to end with: %s' % (path, file))
if name is not None:
assert json_hit.stack_trace_response.body.stackFrames[0]['name'] == name
if line is not None:
@ -3758,6 +3759,50 @@ def test_access_token(case_setup):
writer.finished_ok = True
def test_stop_on_entry(case_setup):
with case_setup.test_file('not_my_code/main_on_entry.py') as writer:
json_facade = JsonFacade(writer)
json_facade.write_launch(
justMyCode=False,
stopOnEntry=True,
rules=[
{'path': '**/not_my_code/**', 'include':False},
]
)
json_facade.write_make_initial_run()
json_facade.wait_for_thread_stopped(
'entry',
file=(
# We need to match the end with the proper slash.
'my_code/__init__.py',
'my_code\\__init__.py'
)
)
json_facade.write_continue()
writer.finished_ok = True
def test_stop_on_entry2(case_setup):
with case_setup.test_file('not_my_code/main_on_entry2.py') as writer:
json_facade = JsonFacade(writer)
json_facade.write_launch(
justMyCode=False,
stopOnEntry=True,
rules=[
{'path': '**/main_on_entry2.py', 'include':False},
]
)
json_facade.write_make_initial_run()
json_facade.wait_for_thread_stopped(
'entry',
file='empty_file.py'
)
json_facade.write_continue()
writer.finished_ok = True
@pytest.mark.parametrize('val', [True, False])
def test_debug_options(case_setup, val):
with case_setup.test_file('_debugger_case_debug_options.py') as writer: