debugpy 1.8.6__zip → 1.8.8__zip

{debugpy-1.8.6 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.pyx

@@ -16,6 +16,7 @@ from _pydevd_bundle.pydevd_constants import (
 )
 from _pydev_bundle import pydev_log
 from _pydev_bundle._pydev_saved_modules import threading
+from _pydev_bundle.pydev_is_thread_alive import is_thread_alive
 import weakref
 
 version = 11
@@ -141,7 +142,7 @@ cdef class PyDBAdditionalThreadInfo:
         if thread is None:
             return False
 
-        if thread._is_stopped:
+        if not is_thread_alive(thread):
             return None
 
         if thread._ident is None:  # Can this happen?
@@ -1374,12 +1375,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
@@ -1396,7 +1397,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:
@@ -1416,7 +1417,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 = []

{debugpy-1.8.6 → debugpy-1.8.8}/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.6 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_frame.py

@@ -1053,12 +1053,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 +1075,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 +1095,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.6 → debugpy-1.8.8}/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,41 +34,50 @@ def add_exception_to_frame(frame, exception_info):
 
 
 def remove_exception_from_frame(frame):
-    frame.f_locals.pop("__exception__", None)
+    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:
@@ -140,6 +148,7 @@ _utf8_with_4_bytes = 0x10000
 def _utf8_byte_offset_to_character_offset(s: str, offset: int):
     byte_offset = 0
     char_offset = 0
+    offset = offset or 0
 
     for char_offset, character in enumerate(s):
         byte_offset += 1

{debugpy-1.8.6 → debugpy-1.8.8}/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.6 → debugpy-1.8.8}/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.6 → debugpy-1.8.8}/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)