debugpy 1.8.7__zip → 1.8.9__zip

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.pyx

@@ -359,7 +359,6 @@ except ImportError:
     def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
         return None
 
-
 # IFDEF CYTHON -- DONT EDIT THIS FILE (it is automatically generated)
 # ELSE
 # # Note: those are now inlined on cython.
@@ -446,7 +445,6 @@ cdef class _TryExceptContainerObj:
 # 
 #     try_except_infos = None
 # 
-# 
 # ENDIF
 
 
@@ -945,7 +943,8 @@ cdef class PyDBFrame:
                         try:
                             func_lines = set()
                             for offset_and_lineno in dis.findlinestarts(frame.f_code):
-                                func_lines.add(offset_and_lineno[1])
+                                if offset_and_lineno[1] is not None:
+                                    func_lines.add(offset_and_lineno[1])
                         except:
                             # This is a fallback for implementations where we can't get the function
                             # lines -- i.e.: jython (in this case clients need to provide the function
@@ -1375,12 +1374,12 @@ cdef class PyDBFrame:
 
 
 # IFDEF CYTHON -- DONT EDIT THIS FILE (it is automatically generated)
-def should_stop_on_exception(py_db, PyDBAdditionalThreadInfo info, frame, thread, arg, prev_user_uncaught_exc_info):
+def should_stop_on_exception(py_db, PyDBAdditionalThreadInfo info, frame, thread, arg, prev_user_uncaught_exc_info, is_unwind=False):
     cdef bint should_stop;
     cdef bint was_just_raised;
     cdef list check_excs;
 # ELSE
-# def should_stop_on_exception(py_db, info, frame, thread, arg, prev_user_uncaught_exc_info):
+# def should_stop_on_exception(py_db, info, frame, thread, arg, prev_user_uncaught_exc_info, is_unwind=False):
     # ENDIF
 
     should_stop = False
@@ -1397,7 +1396,7 @@ def should_stop_on_exception(py_db, PyDBAdditionalThreadInfo info, frame, thread
             exception_breakpoint = None
             try:
                 if py_db.plugin is not None:
-                    result = py_db.plugin.exception_break(py_db, frame, thread, arg)
+                    result = py_db.plugin.exception_break(py_db, frame, thread, arg, is_unwind)
                     if result:
                         should_stop, frame = result
             except:
@@ -1417,7 +1416,7 @@ def should_stop_on_exception(py_db, PyDBAdditionalThreadInfo info, frame, thread
                     pass
 
                 else:
-                    was_just_raised = just_raised(trace)
+                    was_just_raised = trace.tb_next is None
 
                     # It was not handled by any plugin, lets check exception breakpoints.
                     check_excs = []
@@ -1813,9 +1812,7 @@ def fix_top_level_trace_and_get_trace_func(py_db, frame):
             if top_level_thread_tracer is None:
                 # Stop in some internal place to report about unhandled exceptions
                 top_level_thread_tracer = TopLevelThreadTracerOnlyUnhandledExceptions(args)
-                additional_info.top_level_thread_tracer_unhandled = (
-                    top_level_thread_tracer
-                )  # Hack for cython to keep it alive while the thread is alive (just the method in the SetTrace is not enough).
+                additional_info.top_level_thread_tracer_unhandled = top_level_thread_tracer  # Hack for cython to keep it alive while the thread is alive (just the method in the SetTrace is not enough).
 
         # print(' --> found to trace unhandled', f_unhandled.f_code.co_name, f_unhandled.f_code.co_filename, f_unhandled.f_code.co_firstlineno)
         f_trace = top_level_thread_tracer.get_trace_dispatch_func()

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_daemon_thread.py

@@ -101,6 +101,7 @@ def _patch_threading_to_hide_pydevd_threads():
         {"_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"},
+        {"_active_limbo_lock", "values + NULL|self", "_limbo", "_active", "list + NULL"},
     ):
         pydev_log.debug("Applying patching to hide pydevd threads (Py3 version).")
 

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_frame.py

@@ -25,7 +25,6 @@ except ImportError:
     def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
         return None
 
-
 # IFDEF CYTHON
 # cython_inline_constant: CMD_STEP_INTO = 107
 # cython_inline_constant: CMD_STEP_INTO_MY_CODE = 144
@@ -124,7 +123,6 @@ class _TryExceptContainerObj(object):
 
     try_except_infos = None
 
-
 # ENDIF
 
 
@@ -623,7 +621,8 @@ class PyDBFrame:
                         try:
                             func_lines = set()
                             for offset_and_lineno in dis.findlinestarts(frame.f_code):
-                                func_lines.add(offset_and_lineno[1])
+                                if offset_and_lineno[1] is not None:
+                                    func_lines.add(offset_and_lineno[1])
                         except:
                             # This is a fallback for implementations where we can't get the function
                             # lines -- i.e.: jython (in this case clients need to provide the function
@@ -1053,12 +1052,12 @@ class PyDBFrame:
 
 
 # IFDEF CYTHON
-# def should_stop_on_exception(py_db, PyDBAdditionalThreadInfo info, frame, thread, arg, prev_user_uncaught_exc_info):
+# def should_stop_on_exception(py_db, PyDBAdditionalThreadInfo info, frame, thread, arg, prev_user_uncaught_exc_info, is_unwind=False):
 #     cdef bint should_stop;
 #     cdef bint was_just_raised;
 #     cdef list check_excs;
 # ELSE
-def should_stop_on_exception(py_db, info, frame, thread, arg, prev_user_uncaught_exc_info):
+def should_stop_on_exception(py_db, info, frame, thread, arg, prev_user_uncaught_exc_info, is_unwind=False):
     # ENDIF
 
     should_stop = False
@@ -1075,7 +1074,7 @@ def should_stop_on_exception(py_db, info, frame, thread, arg, prev_user_uncaught
             exception_breakpoint = None
             try:
                 if py_db.plugin is not None:
-                    result = py_db.plugin.exception_break(py_db, frame, thread, arg)
+                    result = py_db.plugin.exception_break(py_db, frame, thread, arg, is_unwind)
                     if result:
                         should_stop, frame = result
             except:
@@ -1095,7 +1094,7 @@ def should_stop_on_exception(py_db, info, frame, thread, arg, prev_user_uncaught
                     pass
 
                 else:
-                    was_just_raised = just_raised(trace)
+                    was_just_raised = trace.tb_next is None
 
                     # It was not handled by any plugin, lets check exception breakpoints.
                     check_excs = []

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_frame_utils.py

@@ -1,8 +1,7 @@
-from _pydevd_bundle.pydevd_constants import EXCEPTION_TYPE_USER_UNHANDLED, EXCEPTION_TYPE_UNHANDLED, IS_PY311_OR_GREATER
+from _pydevd_bundle.pydevd_constants import EXCEPTION_TYPE_USER_UNHANDLED, EXCEPTION_TYPE_UNHANDLED, IS_PY311_OR_GREATER, IS_PY313_0
 from _pydev_bundle import pydev_log
 import itertools
 from typing import Any, Dict
-import threading
 from os.path import basename, splitext
 
 
@@ -35,46 +34,50 @@ def add_exception_to_frame(frame, exception_info):
 
 
 def remove_exception_from_frame(frame):
-    # In 3.13 frame.f_locals became a proxy for a dict, so we need to copy it to a real dict
-    # so we can call the defined update method. Just deleting the entry throws in 3.13.
-    items = {key: value for key, value in frame.f_locals.items()}
-    if "__exception__" in items:
-        del items["__exception__"]
-    frame.f_locals.update(items)
+    if IS_PY313_0:
+        # In 3.13.0 frame.f_locals became a proxy for a dict, It does not
+        # have methods to allow items to be removed, only added. So just set the item to None.
+        # Should be fixed in 3.13.1 in PR: https://github.com/python/cpython/pull/125616
+        frame.f_locals["__exception__"] = None
+    else:
+        frame.f_locals.pop("__exception__", None)
 
 
 FILES_WITH_IMPORT_HOOKS = ["pydev_monkey_qt.py", "pydev_import_hook.py"]
 
 
-_thread_local_info = threading.local()
-def flag_as_unwinding(trace):
-    _thread_local_info._unwinding_trace = trace
-
 def just_raised(trace):
     if trace is None:
         return False
-    
-    if hasattr(_thread_local_info, "_unwinding_trace") and _thread_local_info._unwinding_trace is trace:
-        return False
-    
+
     return trace.tb_next is None
 
-def short_tb(exc_type, exc_value, exc_tb):
+
+def short_tb(exc_tb):
     traceback = []
     while exc_tb:
-        traceback.append('{%r, %r, %r}' % (exc_tb.tb_frame.f_code.co_filename,
-                                           exc_tb.tb_frame.f_code.co_name,
-                                           exc_tb.tb_lineno))
+        traceback.append("{%r, %r, %r}" % (exc_tb.tb_frame.f_code.co_filename, exc_tb.tb_frame.f_code.co_name, exc_tb.tb_lineno))
         exc_tb = exc_tb.tb_next
-    return 'Traceback: %s\nError: %s %r\n' % (' -> '.join(traceback), exc_type.__name__, str(exc_value))
+    return "Traceback: %s\n" % (" -> ".join(traceback))
+
 
 def short_frame(frame):
     if frame is None:
-        return 'None'
-    
+        return "None"
+
     filename = frame.f_code.co_filename
     name = splitext(basename(filename))[0]
-    return '%s::%s %s' % (name, frame.f_code.co_name, frame.f_lineno)
+    line = hasattr(frame, "f_lineno") and frame.f_lineno or 1
+    return "%s::%s %s" % (name, frame.f_code.co_name, line)
+
+
+def short_stack(frame):
+    stack = []
+    while frame:
+        stack.append(short_frame(frame))
+        frame = frame.f_back if hasattr(frame, "f_back") else None
+    return "Stack: %s\n" % (" -> ".join(stack))
+
 
 def ignore_exception_trace(trace):
     while trace is not None:

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_plugin_utils.py

@@ -191,9 +191,9 @@ class PluginManager(object):
 
         return None
 
-    def exception_break(self, py_db, frame, thread, arg):
+    def exception_break(self, py_db, frame, thread, arg, is_unwind=False):
         for plugin in self.active_plugins:
-            ret = plugin.exception_break(py_db, frame, thread, arg)
+            ret = plugin.exception_break(py_db, frame, thread, arg, is_unwind)
             if ret is not None:
                 return ret
 

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_process_net_command_json.py

@@ -765,6 +765,7 @@ class PyDevJsonCommandProcessor(object):
         expression = None
 
         breakpoints_set = []
+        arguments.breakpoints = arguments.breakpoints or []
         for bp in arguments.breakpoints:
             hit_condition = self._get_hit_condition_expression(bp.get("hitCondition"))
             condition = bp.get("condition")
@@ -805,7 +806,7 @@ class PyDevJsonCommandProcessor(object):
                 btype = "jinja2-line"
 
         breakpoints_set = []
-
+        arguments.breakpoints = arguments.breakpoints or []
         for source_breakpoint in arguments.breakpoints:
             source_breakpoint = SourceBreakpoint(**source_breakpoint)
             line = source_breakpoint.line

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_save_locals.py

@@ -2,6 +2,8 @@
 Utility for saving locals.
 """
 import sys
+from _pydevd_bundle.pydevd_constants import IS_PY313_OR_GREATER
+from _pydev_bundle import pydev_log
 
 try:
     import types
@@ -54,6 +56,11 @@ def make_save_locals_impl():
 
             return save_locals_pypy_impl
 
+    if IS_PY313_OR_GREATER:
+        # No longer needed in Python 3.13 (deprecated)
+        # See PEP 667
+        return None
+
     try:
         import ctypes
 
@@ -108,8 +115,16 @@ def update_globals_and_locals(updated_globals, initial_globals, frame):
         for key in removed:
             try:
                 del f_locals[key]
-            except KeyError:
-                pass
+            except Exception:
+                # Python 3.13.0 has issues here:
+                # https://github.com/python/cpython/pull/125616
+                # This should be backported from the pull request
+                # but we still need to handle it in this version
+                try:
+                    if key in f_locals:
+                        f_locals[key] = None
+                except Exception as e:
+                    pydev_log.info("Unable to remove key: %s from locals. Exception: %s", key, e)
 
     if f_locals is not None:
         save_locals(frame)

{debugpy-1.8.7 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_trace_dispatch_regular.py

@@ -187,9 +187,7 @@ def fix_top_level_trace_and_get_trace_func(py_db, frame):
             if top_level_thread_tracer is None:
                 # Stop in some internal place to report about unhandled exceptions
                 top_level_thread_tracer = TopLevelThreadTracerOnlyUnhandledExceptions(args)
-                additional_info.top_level_thread_tracer_unhandled = (
-                    top_level_thread_tracer
-                )  # Hack for cython to keep it alive while the thread is alive (just the method in the SetTrace is not enough).
+                additional_info.top_level_thread_tracer_unhandled = top_level_thread_tracer  # Hack for cython to keep it alive while the thread is alive (just the method in the SetTrace is not enough).
 
         # print(' --> found to trace unhandled', f_unhandled.f_code.co_name, f_unhandled.f_code.co_filename, f_unhandled.f_code.co_firstlineno)
         f_trace = top_level_thread_tracer.get_trace_dispatch_func()