debugpy 1.8.6__zip → 1.8.7__zip

{debugpy-1.8.6 → debugpy-1.8.7}/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?

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

@@ -35,7 +35,12 @@ def add_exception_to_frame(frame, exception_info):
 
 
 def remove_exception_from_frame(frame):
-    frame.f_locals.pop("__exception__", None)
+    # 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)
 
 
 FILES_WITH_IMPORT_HOOKS = ["pydev_monkey_qt.py", "pydev_import_hook.py"]
@@ -140,6 +145,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.7}/src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring.py

@@ -13,6 +13,7 @@ from typing import Dict, Optional, Tuple, Any
 from os.path import basename, splitext
 
 from _pydev_bundle import pydev_log
+from _pydev_bundle.pydev_is_thread_alive import is_thread_alive
 from _pydevd_bundle import pydevd_dont_trace
 from _pydevd_bundle.pydevd_constants import (
     GlobalDebuggerHolder,
@@ -459,9 +460,10 @@ def _get_code_line_info(code_obj, _cache={}):
         last_line = None
 
         for offset, line in dis.findlinestarts(code_obj):
-            line_to_offset[line] = offset
+            if offset is not None and line is not None:
+                line_to_offset[line] = offset
 
-        if line_to_offset:
+        if len(line_to_offset):
             first_line = min(line_to_offset)
             last_line = max(line_to_offset)
         ret = _CodeLineInfo(line_to_offset, first_line, last_line)
@@ -837,7 +839,7 @@ def _unwind_event(code, instruction, exc):
     if py_db is None or py_db.pydb_disposed:
         return
 
-    if not thread_info.trace or thread_info.thread._is_stopped:
+    if not thread_info.trace or not is_thread_alive(thread_info.thread):
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -911,7 +913,7 @@ def _raise_event(code, instruction, exc):
     if py_db is None or py_db.pydb_disposed:
         return
 
-    if not thread_info.trace or thread_info.thread._is_stopped:
+    if not thread_info.trace or not is_thread_alive(thread_info.thread):
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -1029,7 +1031,7 @@ def _return_event(code, instruction, retval):
     if py_db is None or py_db.pydb_disposed:
         return monitor.DISABLE
 
-    if not thread_info.trace or thread_info.thread._is_stopped:
+    if not thread_info.trace or not is_thread_alive(thread_info.thread):
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -1340,7 +1342,7 @@ def _jump_event(code, from_offset, to_offset):
     if py_db is None or py_db.pydb_disposed:
         return monitor.DISABLE
 
-    if not thread_info.trace or thread_info.thread._is_stopped:
+    if not thread_info.trace or not is_thread_alive(thread_info.thread):
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -1397,7 +1399,7 @@ def _line_event(code, line):
     if py_db is None or py_db.pydb_disposed:
         return monitor.DISABLE
 
-    if not thread_info.trace or thread_info.thread._is_stopped:
+    if not thread_info.trace or not is_thread_alive(thread_info.thread):
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -1644,7 +1646,7 @@ def _start_method_event(code, instruction_offset):
     if py_db is None or py_db.pydb_disposed:
         return monitor.DISABLE
 
-    if not thread_info.trace or thread_info.thread._is_stopped:
+    if not thread_info.trace or not is_thread_alive(thread_info.thread):
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return