debugpy 1.8.8__zip → 1.8.9__zip

{debugpy-1.8.8 → 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
@@ -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.8 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_daemon_thread.py

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

{debugpy-1.8.8 → 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

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

@@ -124,7 +124,7 @@ def update_globals_and_locals(updated_globals, initial_globals, frame):
                     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)
+                    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.8 → 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()

{debugpy-1.8.8 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_modify_bytecode.py

@@ -59,7 +59,7 @@ def _get_code_line_info(code_obj):
     last_line = None
 
     for offset, line in dis.findlinestarts(code_obj):
-        if line is not None and offset is not None:
+        if line is not None:
             line_to_offset[line] = offset
 
     if line_to_offset:

{debugpy-1.8.8 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/concrete.py

@@ -19,7 +19,6 @@ from _pydevd_frame_eval.vendored.bytecode.instr import (
     _check_arg_int,
 )
 
-
 # - jumps use instruction
 # - lineno use bytes (dis.findlinestarts(code))
 # - dis displays bytes
@@ -169,7 +168,7 @@ class ConcreteBytecode(_bytecode._BaseBytecodeList):
 
     @staticmethod
     def from_code(code, *, extended_arg=False):
-        line_starts = dict(dis.findlinestarts(code))
+        line_starts = dict(entry for entry in dis.findlinestarts(code) if entry[1] is not None)
 
         # find block starts
         instructions = []

{debugpy-1.8.8 → debugpy-1.8.9}/src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring.py

@@ -34,7 +34,6 @@ from _pydevd_bundle.pydevd_trace_dispatch import is_unhandled_exception
 from _pydevd_bundle.pydevd_breakpoints import stop_on_unhandled_exception
 from _pydevd_bundle.pydevd_utils import get_clsname_for_code
 
-
 # fmt: off
 # IFDEF CYTHON
 # import cython
@@ -168,6 +167,7 @@ def _get_bootstrap_frame(depth: int) -> Tuple[Optional[FrameType], bool]:
 
         return f_bootstrap, is_bootstrap_frame_internal
 
+
 # fmt: off
 # IFDEF CYTHON
 # cdef _get_unhandled_exception_frame(exc, int depth):
@@ -373,6 +373,7 @@ def _create_thread_info(depth):
 #     cdef str co_name
 # ELSE
 class FuncCodeInfo:
+
 # ENDIF
 # fmt: on
     def __init__(self):
@@ -496,7 +497,7 @@ def _get_code_line_info(code_obj, _cache={}) -> _CodeLineInfo:
         last_line = None
 
         for offset, line in dis.findlinestarts(code_obj):
-            if offset is not None and line is not None:
+            if line is not None:
                 line_to_offset[line] = offset
 
         if len(line_to_offset):
@@ -868,7 +869,6 @@ def _unwind_event(code, instruction, exc):
         if thread_info is None:
             return
 
-
     py_db: object = GlobalDebuggerHolder.global_dbg
     if py_db is None or py_db.pydb_disposed:
         return
@@ -890,7 +890,6 @@ def _unwind_event(code, instruction, exc):
         py_db.break_on_caught_exceptions or py_db.break_on_user_uncaught_exceptions or py_db.has_plugin_exception_breaks
     )
 
-
     if has_caught_exception_breakpoint_in_pydb:
         _should_stop, frame, user_uncaught_exc_info = should_stop_on_exception(
             py_db, thread_info.additional_info, frame, thread_info.thread, arg, None, is_unwind=True
@@ -1688,7 +1687,6 @@ def _start_method_event(code, instruction_offset):
         # threads may still want it...
         return
 
-
     frame = _getframe(1)
     func_code_info = _get_func_code_info(code, frame)
     if func_code_info.always_skip_code:
@@ -1736,6 +1734,7 @@ def _start_method_event(code, instruction_offset):
 
     return monitor.DISABLE
 
+
 # fmt: off
 # IFDEF CYTHON
 # cpdef _ensure_monitoring():
@@ -1808,7 +1807,7 @@ def stop_monitoring(all_threads=False):
         thread_info.trace = False
 
 
-def update_monitor_events(suspend_requested: Optional[bool] = None) -> None:
+def update_monitor_events(suspend_requested: Optional[bool]=None) -> None:
     """
     This should be called when breakpoints change.
 
@@ -1939,7 +1938,6 @@ def _do_wait_suspend(py_db, thread_info, frame, event, arg):
     thread_info.additional_info.trace_suspend_type = "sys_monitor"
     py_db.do_wait_suspend(thread_info.thread, frame, event, arg)
 
-
 # This can be used to diagnose exceptions inside of the debugger itself.
 #
 # import types