debugpy 1.8.5__zip → 1.8.6__zip

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython_wrapper.py

@@ -1,4 +1,5 @@
 import sys
+
 try:
     try:
         from _pydevd_bundle_ext import pydevd_cython as mod
@@ -10,13 +11,13 @@ except ImportError:
     import struct
 
     try:
-        is_python_64bit = (struct.calcsize('P') == 8)
+        is_python_64bit = struct.calcsize("P") == 8
     except:
         # In Jython this call fails, but this is Ok, we don't support Jython for speedups anyways.
         raise ImportError
-    plat = '32'
+    plat = "32"
     if is_python_64bit:
-        plat = '64'
+        plat = "64"
 
     # We also accept things as:
     #
@@ -26,14 +27,14 @@ except ImportError:
     # to have multiple pre-compiled pyds distributed along the IDE
     # (generated by build_tools/build_binaries_windows.py).
 
-    mod_name = 'pydevd_cython_%s_%s%s_%s' % (sys.platform, sys.version_info[0], sys.version_info[1], plat)
-    check_name = '_pydevd_bundle.%s' % (mod_name,)
+    mod_name = "pydevd_cython_%s_%s%s_%s" % (sys.platform, sys.version_info[0], sys.version_info[1], plat)
+    check_name = "_pydevd_bundle.%s" % (mod_name,)
     mod = getattr(__import__(check_name), mod_name)
 
 # Regardless of how it was found, make sure it's later available as the
 # initial name so that the expected types from cython in frame eval
 # are valid.
-sys.modules['_pydevd_bundle.pydevd_cython'] = mod
+sys.modules["_pydevd_bundle.pydevd_cython"] = mod
 
 trace_dispatch = mod.trace_dispatch
 
@@ -41,6 +42,10 @@ PyDBAdditionalThreadInfo = mod.PyDBAdditionalThreadInfo
 
 set_additional_thread_info = mod.set_additional_thread_info
 
+any_thread_stepping = mod.any_thread_stepping
+
+remove_additional_info = mod.remove_additional_info
+
 global_cache_skips = mod.global_cache_skips
 
 global_cache_frame_skips = mod.global_cache_frame_skips
@@ -49,4 +54,10 @@ _set_additional_thread_info_lock = mod._set_additional_thread_info_lock
 
 fix_top_level_trace_and_get_trace_func = mod.fix_top_level_trace_and_get_trace_func
 
-version = getattr(mod, 'version', 0)
+handle_exception = mod.handle_exception
+
+should_stop_on_exception = mod.should_stop_on_exception
+
+is_unhandled_exception = mod.is_unhandled_exception
+
+version = getattr(mod, "version", 0)

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_daemon_thread.py

@@ -2,26 +2,30 @@ from _pydev_bundle._pydev_saved_modules import threading
 from _pydev_bundle import _pydev_saved_modules
 from _pydevd_bundle.pydevd_utils import notify_about_gevent_if_needed
 import weakref
-from _pydevd_bundle.pydevd_constants import IS_JYTHON, IS_IRONPYTHON, \
-    PYDEVD_APPLY_PATCHING_TO_HIDE_PYDEVD_THREADS
+from _pydevd_bundle.pydevd_constants import (
+    IS_JYTHON,
+    IS_IRONPYTHON,
+    PYDEVD_APPLY_PATCHING_TO_HIDE_PYDEVD_THREADS,
+    PYDEVD_USE_SYS_MONITORING,
+)
 from _pydev_bundle.pydev_log import exception as pydev_log_exception
 import sys
 from _pydev_bundle import pydev_log
 import pydevd_tracing
 from _pydevd_bundle.pydevd_collect_bytecode_info import iter_instructions
+from _pydevd_sys_monitoring import pydevd_sys_monitoring
 
 if IS_JYTHON:
     import org.python.core as JyCore  # @UnresolvedImport
 
 
 class PyDBDaemonThread(threading.Thread):
-
     def __init__(self, py_db, target_and_args=None):
-        '''
+        """
         :param target_and_args:
             tuple(func, args, kwargs) if this should be a function and args to run.
             -- Note: use through run_as_pydevd_daemon_thread().
-        '''
+        """
         threading.Thread.__init__(self)
         notify_about_gevent_if_needed()
         self._py_db = weakref.ref(py_db)
@@ -58,61 +62,65 @@ class PyDBDaemonThread(threading.Thread):
             target, args, kwargs = self._target_and_args
             target(*args, **kwargs)
         else:
-            raise NotImplementedError('Should be reimplemented by: %s' % self.__class__)
+            raise NotImplementedError("Should be reimplemented by: %s" % self.__class__)
 
     def do_kill_pydev_thread(self):
         if not self._kill_received:
-            pydev_log.debug('%s received kill signal', self.name)
+            pydev_log.debug("%s received kill signal", self.name)
             self._kill_received = True
 
     def _stop_trace(self):
         if self.pydev_do_not_trace:
+            if PYDEVD_USE_SYS_MONITORING:
+                pydevd_sys_monitoring.stop_monitoring(all_threads=False)
+                return
             pydevd_tracing.SetTrace(None)  # no debugging on this thread
 
 
 def _collect_load_names(func):
     found_load_names = set()
     for instruction in iter_instructions(func.__code__):
-        if instruction.opname in ('LOAD_GLOBAL', 'LOAD_ATTR', 'LOAD_METHOD'):
+        if instruction.opname in ("LOAD_GLOBAL", "LOAD_ATTR", "LOAD_METHOD"):
             found_load_names.add(instruction.argrepr)
     return found_load_names
 
 
 def _patch_threading_to_hide_pydevd_threads():
-    '''
+    """
     Patches the needed functions on the `threading` module so that the pydevd threads are hidden.
 
     Note that we patch the functions __code__ to avoid issues if some code had already imported those
     variables prior to the patching.
-    '''
+    """
     found_load_names = _collect_load_names(threading.enumerate)
     # i.e.: we'll only apply the patching if the function seems to be what we expect.
 
     new_threading_enumerate = None
 
     if found_load_names in (
-        {'_active_limbo_lock', '_limbo', '_active', 'values', 'list'},
-        {'_active_limbo_lock', '_limbo', '_active', 'values', 'NULL + list'}
-        ):
-        pydev_log.debug('Applying patching to hide pydevd threads (Py3 version).')
+        {"_active_limbo_lock", "_limbo", "_active", "values", "list"},
+        {"_active_limbo_lock", "_limbo", "_active", "values", "NULL + list"},
+        {"NULL + list", "_active", "_active_limbo_lock", "NULL|self + values", "_limbo"},
+    ):
+        pydev_log.debug("Applying patching to hide pydevd threads (Py3 version).")
 
         def new_threading_enumerate():
             with _active_limbo_lock:
                 ret = list(_active.values()) + list(_limbo.values())
 
-            return [t for t in ret if not getattr(t, 'is_pydev_daemon_thread', False)]
+            return [t for t in ret if not getattr(t, "is_pydev_daemon_thread", False)]
 
-    elif found_load_names == set(('_active_limbo_lock', '_limbo', '_active', 'values')):
-        pydev_log.debug('Applying patching to hide pydevd threads (Py2 version).')
+    elif found_load_names == set(("_active_limbo_lock", "_limbo", "_active", "values")):
+        pydev_log.debug("Applying patching to hide pydevd threads (Py2 version).")
 
         def new_threading_enumerate():
             with _active_limbo_lock:
                 ret = _active.values() + _limbo.values()
 
-            return [t for t in ret if not getattr(t, 'is_pydev_daemon_thread', False)]
+            return [t for t in ret if not getattr(t, "is_pydev_daemon_thread", False)]
 
     else:
-        pydev_log.info('Unable to hide pydevd threads. Found names in threading.enumerate: %s', found_load_names)
+        pydev_log.info("Unable to hide pydevd threads. Found names in threading.enumerate: %s", found_load_names)
 
     if new_threading_enumerate is not None:
 
@@ -143,7 +151,7 @@ def _patch_threading_to_hide_pydevd_threads():
         # But in this particular case, we do want threads with `is_pydev_daemon_thread` to appear
         # explicitly due to the pydevd `CheckAliveThread` (because we want the shutdown to wait on it).
         # So, it can't rely on the `enumerate` for that anymore as it's patched to not return pydevd threads.
-        if hasattr(threading, '_pickSomeNonDaemonThread'):
+        if hasattr(threading, "_pickSomeNonDaemonThread"):
 
             def new_pick_some_non_daemon_thread():
                 with _active_limbo_lock:
@@ -176,7 +184,7 @@ def mark_as_pydevd_daemon_thread(thread):
             try:
                 _patch_threading_to_hide_pydevd_threads()
             except:
-                pydev_log.exception('Error applying patching to hide pydevd threads.')
+                pydev_log.exception("Error applying patching to hide pydevd threads.")
 
     thread.pydev_do_not_trace = True
     thread.is_pydev_daemon_thread = True
@@ -184,10 +192,10 @@ def mark_as_pydevd_daemon_thread(thread):
 
 
 def run_as_pydevd_daemon_thread(py_db, func, *args, **kwargs):
-    '''
+    """
     Runs a function as a pydevd daemon thread (without any tracing in place).
-    '''
+    """
     t = PyDBDaemonThread(py_db, target_and_args=(func, args, kwargs))
-    t.name = '%s (pydevd daemon thread)' % (func.__name__,)
+    t.name = "%s (pydevd daemon thread)" % (func.__name__,)
     t.start()
     return t

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_defaults.py

@@ -1,6 +1,6 @@
-'''
+"""
 This module holds the customization settings for the debugger.
-'''
+"""
 
 from _pydevd_bundle.pydevd_constants import QUOTED_LINE_PROTOCOL
 from _pydev_bundle import pydev_log
@@ -17,7 +17,7 @@ class PydevdCustomization(object):
     # py_db.skip_suspend_on_breakpoint_exception = (BaseException,)
     # py_db.skip_print_breakpoint_exception = (NameError,)
     # py_db.multi_threads_single_notification = True
-    DEBUG_MODE: str = ''
+    DEBUG_MODE: str = ""
 
     # This may be a <sys_path_entry>;<module_name> to be pre-imported
     # Something as: 'c:/temp/foo;my_module.bar'
@@ -33,24 +33,24 @@ class PydevdCustomization(object):
     # If the pre-import fails an output message is
     # sent (but apart from that debugger execution
     # should continue).
-    PREIMPORT: str = ''
+    PREIMPORT: str = ""
 
 
 def on_pydb_init(py_db):
-    if PydevdCustomization.DEBUG_MODE == 'debugpy-dap':
-        pydev_log.debug('Apply debug mode: debugpy-dap')
+    if PydevdCustomization.DEBUG_MODE == "debugpy-dap":
+        pydev_log.debug("Apply debug mode: debugpy-dap")
         py_db.skip_suspend_on_breakpoint_exception = (BaseException,)
         py_db.skip_print_breakpoint_exception = (NameError,)
         py_db.multi_threads_single_notification = True
     elif not PydevdCustomization.DEBUG_MODE:
-        pydev_log.debug('Apply debug mode: default')
+        pydev_log.debug("Apply debug mode: default")
     else:
-        pydev_log.debug('WARNING: unknown debug mode: %s', PydevdCustomization.DEBUG_MODE)
+        pydev_log.debug("WARNING: unknown debug mode: %s", PydevdCustomization.DEBUG_MODE)
 
     if PydevdCustomization.PREIMPORT:
-        pydev_log.debug('Preimport: %s', PydevdCustomization.PREIMPORT)
+        pydev_log.debug("Preimport: %s", PydevdCustomization.PREIMPORT)
         try:
-            sys_path_entry, module_name = PydevdCustomization.PREIMPORT.rsplit(';', maxsplit=1)
+            sys_path_entry, module_name = PydevdCustomization.PREIMPORT.rsplit(";", maxsplit=1)
         except Exception:
             pydev_log.exception("Expected ';' in %s" % (PydevdCustomization.PREIMPORT,))
         else:
@@ -61,6 +61,4 @@ def on_pydb_init(py_db):
                 finally:
                     sys.path.remove(sys_path_entry)
             except Exception:
-                pydev_log.exception(
-                    "Error importing %s (with sys.path entry: %s)" % (module_name, sys_path_entry))
-
+                pydev_log.exception("Error importing %s (with sys.path entry: %s)" % (module_name, sys_path_entry))

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_dont_trace.py

@@ -1,6 +1,6 @@
-'''
+"""
 Support for a tag that allows skipping over functions while debugging.
-'''
+"""
 import linecache
 import re
 
@@ -17,21 +17,21 @@ import re
 #
 # def test2(): #@DontTrace
 #     pass
-DONT_TRACE_TAG = '@DontTrace'
+DONT_TRACE_TAG = "@DontTrace"
 
 # Regular expression to match a decorator (at the beginning
 # of a line).
-RE_DECORATOR = re.compile(r'^\s*@')
+RE_DECORATOR = re.compile(r"^\s*@")
 
 # Mapping from code object to bool.
 # If the key exists, the value is the cached result of should_trace_hook
 _filename_to_ignored_lines = {}
 
 
-def default_should_trace_hook(frame, absolute_filename):
-    '''
+def default_should_trace_hook(code, absolute_filename):
+    """
     Return True if this frame should be traced, False if tracing should be blocked.
-    '''
+    """
     # First, check whether this code object has a cached value
     ignored_lines = _filename_to_ignored_lines.get(absolute_filename)
     if ignored_lines is None:
@@ -47,7 +47,7 @@ def default_should_trace_hook(frame, absolute_filename):
         ignored_lines = {}
         lines = linecache.getlines(absolute_filename)
         for i_line, line in enumerate(lines):
-            j = line.find('#')
+            j = line.find("#")
             if j >= 0:
                 comment = line[j:]
                 if DONT_TRACE_TAG in comment:
@@ -72,20 +72,21 @@ def default_should_trace_hook(frame, absolute_filename):
 
         _filename_to_ignored_lines[absolute_filename] = ignored_lines
 
-    func_line = frame.f_code.co_firstlineno - 1  # co_firstlineno is 1-based, so -1 is needed
+    func_line = code.co_firstlineno - 1  # co_firstlineno is 1-based, so -1 is needed
     return not (
-        func_line - 1 in ignored_lines or  # -1 to get line before method
-        func_line in ignored_lines)  # method line
+        func_line - 1 in ignored_lines  # -1 to get line before method
+        or func_line in ignored_lines
+    )  # method line
 
 
 should_trace_hook = None
 
 
 def clear_trace_filter_cache():
-    '''
+    """
     Clear the trace filter cache.
     Call this after reloading.
-    '''
+    """
     global should_trace_hook
     try:
         # Need to temporarily disable a hook because otherwise
@@ -102,14 +103,14 @@ def clear_trace_filter_cache():
 
 
 def trace_filter(mode):
-    '''
+    """
     Set the trace filter mode.
 
     mode: Whether to enable the trace hook.
       True: Trace filtering on (skipping methods tagged @DontTrace)
       False: Trace filtering off (trace methods tagged @DontTrace)
       None/default: Toggle trace filtering.
-    '''
+    """
     global should_trace_hook
     if mode is None:
         mode = should_trace_hook is None
@@ -120,4 +121,3 @@ def trace_filter(mode):
         should_trace_hook = None
 
     return mode
-

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_dont_trace_files.py

@@ -1,5 +1,6 @@
 # Important: Autogenerated file.
 
+# fmt: off
 # DO NOT edit manually!
 # DO NOT edit manually!
 
@@ -11,7 +12,8 @@ DONT_TRACE_DIRS = {
     '_pydev_runfiles': PYDEV_FILE,
     '_pydevd_bundle': PYDEV_FILE,
     '_pydevd_frame_eval': PYDEV_FILE,
-    'pydev_ipython': PYDEV_FILE,
+    '_pydevd_sys_monitoring': PYDEV_FILE,
+    'pydev_ipython': LIB_FILE,
     'pydev_sitecustomize': PYDEV_FILE,
     'pydevd_attach_to_process': PYDEV_FILE,
     'pydevd_concurrency_analyser': PYDEV_FILE,
@@ -19,6 +21,25 @@ DONT_TRACE_DIRS = {
     'test_pydevd_reload': PYDEV_FILE,
 }
 
+LIB_FILES_IN_DONT_TRACE_DIRS = {
+    '__init__.py',
+    'inputhook.py',
+    'inputhookglut.py',
+    'inputhookgtk.py',
+    'inputhookgtk3.py',
+    'inputhookpyglet.py',
+    'inputhookqt4.py',
+    'inputhookqt5.py',
+    'inputhookqt6.py',
+    'inputhooktk.py',
+    'inputhookwx.py',
+    'matplotlibtools.py',
+    'qt.py',
+    'qt_for_kernel.py',
+    'qt_loaders.py',
+    'version.py',
+}
+
 DONT_TRACE = {
     # commonly used things from the stdlib that we don't want to trace
     'Queue.py':LIB_FILE,
@@ -43,6 +64,7 @@ DONT_TRACE = {
     '_pydev_saved_modules.py': PYDEV_FILE,
     '_pydev_sys_patch.py': PYDEV_FILE,
     '_pydev_tipper_common.py': PYDEV_FILE,
+    '_pydevd_sys_monitoring.py': PYDEV_FILE,
     'django_debug.py': PYDEV_FILE,
     'jinja2_debug.py': PYDEV_FILE,
     'pycompletionserver.py': PYDEV_FILE,
@@ -78,6 +100,7 @@ DONT_TRACE = {
     'pydevd_base_schema.py': PYDEV_FILE,
     'pydevd_breakpoints.py': PYDEV_FILE,
     'pydevd_bytecode_utils.py': PYDEV_FILE,
+    'pydevd_bytecode_utils_py311.py': PYDEV_FILE,
     'pydevd_code_to_source.py': PYDEV_FILE,
     'pydevd_collect_bytecode_info.py': PYDEV_FILE,
     'pydevd_comm.py': PYDEV_FILE,
@@ -130,10 +153,10 @@ DONT_TRACE = {
     'pydevd_source_mapping.py': PYDEV_FILE,
     'pydevd_stackless.py': PYDEV_FILE,
     'pydevd_suspended_frames.py': PYDEV_FILE,
+    'pydevd_sys_monitoring.py': PYDEV_FILE,
     'pydevd_thread_lifecycle.py': PYDEV_FILE,
     'pydevd_thread_wrappers.py': PYDEV_FILE,
     'pydevd_timeout.py': PYDEV_FILE,
-    'pydevd_trace_api.py': PYDEV_FILE,
     'pydevd_trace_dispatch.py': PYDEV_FILE,
     'pydevd_trace_dispatch_regular.py': PYDEV_FILE,
     'pydevd_traceproperty.py': PYDEV_FILE,
@@ -151,3 +174,5 @@ DONT_TRACE['io.py'] = LIB_FILE
 DONT_TRACE['cp1252.py'] = LIB_FILE
 DONT_TRACE['utf_8.py'] = LIB_FILE
 DONT_TRACE['codecs.py'] = LIB_FILE
+
+# fmt: on

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_exec2.py

@@ -2,4 +2,4 @@ def Exec(exp, global_vars, local_vars=None):
     if local_vars is not None:
         exec(exp, global_vars, local_vars)
     else:
-        exec(exp, global_vars)
+        exec(exp, global_vars)

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_extension_api.py

@@ -7,11 +7,10 @@ def _with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
 
     class metaclass(meta):
-
         def __new__(cls, name, this_bases, d):
             return meta(name, bases, d)
 
-    return type.__new__(metaclass, 'temporary_class', (), {})
+    return type.__new__(metaclass, "temporary_class", (), {})
 
 
 # =======================================================================================================================
@@ -50,11 +49,11 @@ class _AbstractResolver(_with_metaclass(abc.ABCMeta)):
 
 
 class _AbstractProvider(_with_metaclass(abc.ABCMeta)):
-
     @abc.abstractmethod
     def can_provide(self, type_object, type_name):
         raise NotImplementedError
 
+
 # =======================================================================================================================
 # API CLASSES:
 # =======================================================================================================================
@@ -72,7 +71,7 @@ class StrPresentationProvider(_AbstractProvider):
     """
 
     def get_str_in_context(self, val: Any, context: str):
-        '''
+        """
         :param val:
             This is the object for which we want a string representation.
 
@@ -86,7 +85,7 @@ class StrPresentationProvider(_AbstractProvider):
         :note: this method is not required (if it's not available, get_str is called directly,
                so, it's only needed if the string representation needs to be converted based on
                the context).
-        '''
+        """
         return self.get_str(val)
 
     @abc.abstractmethod

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_extension_utils.py

@@ -1,6 +1,7 @@
 import pkgutil
 import sys
 from _pydev_bundle import pydev_log
+
 try:
     import pydevd_plugins.extensions as extensions
 except:
@@ -9,7 +10,6 @@ except:
 
 
 class ExtensionManager(object):
-
     def __init__(self):
         self.loaded_extensions = None
         self.type_to_instance = {}
@@ -17,16 +17,15 @@ class ExtensionManager(object):
     def _load_modules(self):
         self.loaded_extensions = []
         if extensions:
-            for module_loader, name, ispkg in pkgutil.walk_packages(extensions.__path__,
-                                                                    extensions.__name__ + '.'):
-                mod_name = name.split('.')[-1]
-                if not ispkg and mod_name.startswith('pydevd_plugin'):
+            for module_loader, name, ispkg in pkgutil.walk_packages(extensions.__path__, extensions.__name__ + "."):
+                mod_name = name.split(".")[-1]
+                if not ispkg and mod_name.startswith("pydevd_plugin"):
                     try:
                         __import__(name)
                         module = sys.modules[name]
                         self.loaded_extensions.append(module)
                     except ImportError:
-                        pydev_log.critical('Unable to load extension: %s', name)
+                        pydev_log.critical("Unable to load extension: %s", name)
 
     def _ensure_loaded(self):
         if self.loaded_extensions is None:
@@ -34,9 +33,9 @@ class ExtensionManager(object):
 
     def _iter_attr(self):
         for extension in self.loaded_extensions:
-            dunder_all = getattr(extension, '__all__', None)
+            dunder_all = getattr(extension, "__all__", None)
             for attr_name in dir(extension):
-                if not attr_name.startswith('_'):
+                if not attr_name.startswith("_"):
                     if dunder_all is None or attr_name in dunder_all:
                         yield attr_name, getattr(extension, attr_name)
 
@@ -50,7 +49,7 @@ class ExtensionManager(object):
                 try:
                     handlers.append(attr())
                 except:
-                    pydev_log.exception('Unable to load extension class: %s', attr_name)
+                    pydev_log.exception("Unable to load extension class: %s", attr_name)
         return handlers
 
 
@@ -64,4 +63,3 @@ def extensions_of_type(extension_type):
     :rtype: list[T]
     """
     return EXTENSION_MANAGER_INSTANCE.get_extension_classes(extension_type)
-