debugpy 1.8.7__zip → 1.8.9__zip

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

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

{debugpy-1.8.7 → 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.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/COPYING

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+Copyright (c) 2016 Red Hat.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

debugpy-1.8.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/INSTALLER

@@ -0,0 +1 @@
+pip

debugpy-1.8.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/METADATA

@@ -0,0 +1,77 @@
+Metadata-Version: 2.1
+Name: bytecode
+Version: 0.13.0.dev0
+Summary: Python module to generate and modify bytecode
+Home-page: https://github.com/MatthieuDartiailh/bytecode
+Author: Victor Stinner
+Author-email: victor.stinner@gmail.com
+Maintainer: Matthieu C. Dartiailh
+Maintainer-email: m.dartiailh@gmail.com
+License: MIT license
+Platform: UNKNOWN
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.6
+
+********
+bytecode
+********
+
+.. image:: https://img.shields.io/pypi/v/bytecode.svg
+   :alt: Latest release on the Python Cheeseshop (PyPI)
+   :target: https://pypi.python.org/pypi/bytecode
+
+.. image:: https://github.com/MatthieuDartiailh/bytecode/workflows/Continuous%20Integration/badge.svg
+    :target: https://github.com/MatthieuDartiailh/bytecode/actions
+    :alt: Continuous integration
+
+.. image:: https://github.com/MatthieuDartiailh/bytecode/workflows/Documentation%20building/badge.svg
+    :target: https://github.com/MatthieuDartiailh/bytecode/actions
+    :alt: Documentation building
+
+.. image:: https://img.shields.io/codecov/c/github/MatthieuDartiailh/bytecode/master.svg
+   :alt: Code coverage of bytecode on codecov.io
+   :target: https://codecov.io/github/MatthieuDartiailh/bytecode
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+   :alt: Code formatted using Black
+   :target: https://github.com/psf/black
+
+``bytecode`` is a Python module to generate and modify bytecode.
+
+* `bytecode project homepage at GitHub
+  <https://github.com/MatthieuDartiailh/bytecode>`_ (code, bugs)
+* `bytecode documentation
+  <https://bytecode.readthedocs.io/>`_
+* `Download latest bytecode release at the Python Cheeseshop (PyPI)
+  <https://pypi.python.org/pypi/bytecode>`_
+
+Install bytecode: ``python3 -m pip install bytecode``. It requires Python 3.6
+or newer. The latest release that supports Python 3.5 is 0.12.0. For Python 2.7
+support, have a look at  `dead-bytecode
+<https://github.com/p403n1x87/dead-bytecode>`_ instead.
+
+Example executing ``print('Hello World!')``:
+
+.. code:: python
+
+    from bytecode import Instr, Bytecode
+
+    bytecode = Bytecode([Instr("LOAD_NAME", 'print'),
+                         Instr("LOAD_CONST", 'Hello World!'),
+                         Instr("CALL_FUNCTION", 1),
+                         Instr("POP_TOP"),
+                         Instr("LOAD_CONST", None),
+                         Instr("RETURN_VALUE")])
+    code = bytecode.to_code()
+    exec(code)
+

debugpy-1.8.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/RECORD

@@ -0,0 +1,42 @@
+bytecode-0.13.0.dev0.dist-info/COPYING,sha256=baWkm-Te2LLURwK7TL0zOkMSVjVCU_ezvObHBo298Tk,1074
+bytecode-0.13.0.dev0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+bytecode-0.13.0.dev0.dist-info/METADATA,sha256=9XadDK6YTQ-FPowYI5DS4ieA7hRGnRP_fM5Z9ioPkEQ,2929
+bytecode-0.13.0.dev0.dist-info/RECORD,,
+bytecode-0.13.0.dev0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bytecode-0.13.0.dev0.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
+bytecode-0.13.0.dev0.dist-info/direct_url.json,sha256=s58Rb4KXRlMKxk-mzpvr_tJRQ-Hx8-DHsU6NdohCnAg,93
+bytecode-0.13.0.dev0.dist-info/top_level.txt,sha256=9BhdB7HqYZ-PvHNoWX6ilwLYWQqcgEOLwdb3aXm5Gys,9
+bytecode/__init__.py,sha256=d-yk4Xh4SwOWq9NgoD2rmBLG6RhUFNljeqs-NjMNSYM,3885
+bytecode/__pycache__/__init__.cpython-38.pyc,,
+bytecode/__pycache__/bytecode.cpython-38.pyc,,
+bytecode/__pycache__/cfg.cpython-38.pyc,,
+bytecode/__pycache__/concrete.cpython-38.pyc,,
+bytecode/__pycache__/flags.cpython-38.pyc,,
+bytecode/__pycache__/instr.cpython-38.pyc,,
+bytecode/__pycache__/peephole_opt.cpython-38.pyc,,
+bytecode/bytecode.py,sha256=IMCcatHMtQ7M31nwj4r3drcvQuGVJAOP0d7C0O8P_SE,6894
+bytecode/cfg.py,sha256=RmJGJqwCxR-XYaPH9YGY4wNDycdtLvIBJb1OGSmxcN0,15274
+bytecode/concrete.py,sha256=0eb6Yh_NDLmzJNcMs2TFom0EqFVSM1cO3inMH90YE-s,21683
+bytecode/flags.py,sha256=hAvM_B2yQKRw44leHP0oCae0aaJraAbDDTpqIf4I1CM,5987
+bytecode/instr.py,sha256=HYc65LjNSOB3GCWkNkCSkee1rRzUyr89rgdjbKBaTpE,11616
+bytecode/peephole_opt.py,sha256=W-cFVPOZN-JKfDV3aImsYenDSZkSNBDTVQqeMrGPU18,15712
+bytecode/tests/__init__.py,sha256=BAdOXXNRdMVX4D8TuRYPlG9PHU7Cb0bzvyfA9s435kM,4968
+bytecode/tests/__pycache__/__init__.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_bytecode.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_cfg.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_code.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_concrete.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_flags.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_instr.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_misc.cpython-38.pyc,,
+bytecode/tests/__pycache__/test_peephole_opt.cpython-38.pyc,,
+bytecode/tests/__pycache__/util_annotation.cpython-38.pyc,,
+bytecode/tests/test_bytecode.py,sha256=buvtlDC0NwoQ3zuZ7OENIIDngSqtiO9WkAa2-UvxGkI,15584
+bytecode/tests/test_cfg.py,sha256=c0xT8OfV-mDHu-DIDWr6LVlZQyK4GfgLSmT5AsodbMk,28194
+bytecode/tests/test_code.py,sha256=XCOH29rOXSoQz130s-AIC62r23e9qNjk8Y2xDB2LmSc,2100
+bytecode/tests/test_concrete.py,sha256=qT2qvabkF0yC7inniNx53cMSDN-2Qi0IE3pwBZSzF8g,49253
+bytecode/tests/test_flags.py,sha256=DY9U3c6tJdxJFm0jEm_To1Cc0I99EidQv_0guud-4oE,5684
+bytecode/tests/test_instr.py,sha256=rYeF8u-L0aW8bLPBxTUSy_T7KP6SaXyJKv9OhC8k6aA,11295
+bytecode/tests/test_misc.py,sha256=wyK1wpVPHRfaXgo-EqUI-F1nyB9-UACerHsHbExAo1U,6758
+bytecode/tests/test_peephole_opt.py,sha256=niUfhgEbiFR7IAmdQ_N9Qgh7D3wdRQ_zS0V8mKC4EzI,32640
+bytecode/tests/util_annotation.py,sha256=wKq6yPWrzkNlholl5Y10b3VjuCkoiYVgvcIjk_8jzf8,485

debugpy-1.8.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/WHEEL

@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: bdist_wheel (0.36.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+

debugpy-1.8.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/direct_url.json

@@ -0,0 +1 @@
+{"archive_info": {}, "url": "https://github.com/MatthieuDartiailh/bytecode/archive/main.zip"}

debugpy-1.8.9/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/top_level.txt

@@ -0,0 +1 @@
+bytecode

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

@@ -13,9 +13,9 @@ 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 (
+    IS_PY313_OR_GREATER,
     GlobalDebuggerHolder,
     ForkSafeLock,
     PYDEVD_IPYTHON_CONTEXT,
@@ -23,7 +23,6 @@ from _pydevd_bundle.pydevd_constants import (
     RETURN_VALUES_DICT,
     PYTHON_SUSPEND,
 )
-from _pydevd_bundle.pydevd_frame_utils import short_tb, flag_as_unwinding, short_frame
 from pydevd_file_utils import (
     NORM_PATHS_AND_BASE_CONTAINER,
     get_abs_path_real_path_and_base_from_file,
@@ -60,10 +59,8 @@ _thread_local_info = threading.local()
 _get_ident = threading.get_ident
 _thread_active = threading._active  # noqa
 
-STATE_SUSPEND: int = 2
 CMD_STEP_INTO: int = 107
 CMD_STEP_OVER: int = 108
-CMD_STEP_OVER_MY_CODE: int = 159
 CMD_STEP_INTO_MY_CODE: int = 144
 CMD_STEP_INTO_COROUTINE: int = 206
 CMD_SMART_STEP_INTO: int = 128
@@ -170,67 +167,65 @@ def _get_bootstrap_frame(depth: int) -> Tuple[Optional[FrameType], bool]:
 
         return f_bootstrap, is_bootstrap_frame_internal
 
+
 # fmt: off
 # IFDEF CYTHON
-# cdef _is_user_frame(frame: FrameType):
+# cdef _get_unhandled_exception_frame(exc, int depth):
 # ELSE
-def _is_user_frame(frame: FrameType) -> bool:
+def _get_unhandled_exception_frame(exc, depth: int) -> Optional[FrameType]:
 # ENDIF
 # fmt: on
-    if frame is None:
-        return False
+    try:
+        # Unhandled frame has to be from the same exception.
+        if _thread_local_info.f_unhandled_exc is exc:
+            return _thread_local_info.f_unhandled_frame
+        else:
+            del _thread_local_info.f_unhandled_frame
+            del _thread_local_info.f_unhandled_exc
+            raise AttributeError('Not the same exception')
+    except:
+        f_unhandled = _getframe(depth)
 
-    filename = frame.f_code.co_filename
-    name = splitext(basename(filename))[0]
+        while f_unhandled is not None and f_unhandled.f_back is not None:
+            f_back = f_unhandled.f_back
+            filename = f_back.f_code.co_filename
+            name = splitext(basename(filename))[0]
 
-    # When the frame is the bootstrap it is not a user frame.
-    if name == "threading":
-        if frame.f_code.co_name in ("__bootstrap", "_bootstrap", "__bootstrap_inner", "_bootstrap_inner", "run"):
-            return False
+            # When the back frame is the bootstrap (or if we have no back
+            # frame) then use this frame as the one to track.
+            if name == "threading":
+                if f_back.f_code.co_name in ("__bootstrap", "_bootstrap", "__bootstrap_inner", "_bootstrap_inner", "run"):
+                    break
 
-    elif name == "pydev_monkey":
-        if frame.f_code.co_name == "__call__":
-            return False
+            elif name == "pydev_monkey":
+                if f_back.f_code.co_name == "__call__":
+                    break
 
-    elif name == "pydevd":
-        if frame.f_code.co_name in ("_exec", "run", "main"):
-            return False
+            elif name == "pydevd":
+                if f_back.f_code.co_name in ("_exec", "run", "main"):
+                    break
 
-    elif name == "pydevd_runpy":
-        if frame.f_code.co_name.startswith(("run", "_run")):
-            return False
+            elif name == "pydevd_runpy":
+                if f_back.f_code.co_name.startswith(("run", "_run")):
+                    break
 
-    elif filename == "<frozen runpy>":
-        if frame.f_code.co_name.startswith(("run", "_run")):
-            return False
+            elif name == "<frozen runpy>":
+                if f_back.f_code.co_name.startswith(("run", "_run")):
+                    break
 
-    elif name == 'runpy':
-        if frame.f_code.co_name.startswith(("run", "_run")):
-            return False
+            elif name == "runpy":
+                if f_back.f_code.co_name.startswith(("run", "_run")):
+                    break
 
-    return True
+            f_unhandled = f_back
+
+        if f_unhandled is not None:
+            _thread_local_info.f_unhandled_frame = f_unhandled
+            _thread_local_info.f_unhandled_exc = exc
+            return _thread_local_info.f_unhandled_frame
+
+        return f_unhandled
 
-# fmt: off
-# IFDEF CYTHON
-# cdef _is_last_user_frame(frame: FrameType):
-# ELSE
-def _is_last_user_frame(frame: FrameType) -> bool:
-# ENDIF
-# fmt: on 
-    # If this frame is not a user frame, then it can't be the last one
-    if not _is_user_frame(frame):
-        return False
-    
-    # If this frame is the last frame, then it is the last one
-    if frame.f_back is None:
-        return True
-    
-    # If the next frame is not a user frame, then this frame is the last one
-    if not _is_user_frame(frame.f_back):
-        return True
-    
-    # Otherwise if the next frame is a user frame, then this frame is not the last one
-    return False
 
 # fmt: off
 # IFDEF CYTHON
@@ -239,6 +234,7 @@ def _is_last_user_frame(frame: FrameType) -> bool:
 #     cdef PyDBAdditionalThreadInfo additional_info
 #     thread: threading.Thread
 #     trace: bool
+#     _use_is_stopped: bool
 # ELSE
 class ThreadInfo:
     additional_info: PyDBAdditionalThreadInfo
@@ -259,6 +255,19 @@ class ThreadInfo:
         self.thread_ident = thread_ident
         self.additional_info = additional_info
         self.trace = trace
+        self._use_is_stopped = hasattr(thread, '_is_stopped')
+        
+    # fmt: off
+    # IFDEF CYTHON
+    # cdef bint is_thread_alive(self):
+    # ELSE
+    def is_thread_alive(self):
+    # ENDIF
+    # fmt: on
+        if self._use_is_stopped:
+            return not self.thread._is_stopped
+        else:
+            return not self.thread._handle.is_done()
 
 
 class _DeleteDummyThreadOnDel:
@@ -322,7 +331,7 @@ def _create_thread_info(depth):
     if t is None:
         t = _thread_active.get(thread_ident)
 
-    if isinstance(t, threading._DummyThread):
+    if isinstance(t, threading._DummyThread) and not IS_PY313_OR_GREATER:
         _thread_local_info._ref = _DeleteDummyThreadOnDel(t)
 
     if t is None:
@@ -364,6 +373,7 @@ def _create_thread_info(depth):
 #     cdef str co_name
 # ELSE
 class FuncCodeInfo:
+
 # ENDIF
 # fmt: on
     def __init__(self):
@@ -409,8 +419,9 @@ class FuncCodeInfo:
 
     def get_line_of_offset(self, offset):
         for start, end, line in self.code_obj.co_lines():
-            if offset >= start and offset <= end:
-                return line
+            if start is not None and end is not None and line is not None:
+                if offset >= start and offset <= end:
+                    return line
         return -1
 
 
@@ -441,15 +452,41 @@ def _get_thread_info(create: bool, depth: int) -> Optional[ThreadInfo]:
         return _thread_local_info.thread_info
 
 
-_CodeLineInfo = namedtuple("_CodeLineInfo", "line_to_offset, first_line, last_line")
+# fmt: off
+# IFDEF CYTHON
+# cdef class _CodeLineInfo:
+#     cdef dict line_to_offset
+#     cdef int first_line
+#     cdef int last_line
+# ELSE
+class _CodeLineInfo:
+    line_to_offset: Dict[int, Any]
+    first_line: int
+    last_line: int
+# ENDIF
+# fmt: on
 
+    # fmt: off
+    # IFDEF CYTHON
+    # def __init__(self, dict line_to_offset, int first_line, int last_line):
+    #     self.line_to_offset = line_to_offset
+    #     self.first_line = first_line
+    #     self.last_line = last_line
+    # ELSE
+    def __init__(self, line_to_offset, first_line, last_line):
+        self.line_to_offset = line_to_offset
+        self.first_line = first_line
+        self.last_line = last_line
+
+    # ENDIF
+    # fmt: on
 
 # Note: this method has a version in cython too
 # fmt: off
 # IFDEF CYTHON
-# cdef _get_code_line_info(code_obj, _cache={}):
+# cdef _CodeLineInfo _get_code_line_info(code_obj, _cache={}):
 # ELSE
-def _get_code_line_info(code_obj, _cache={}):
+def _get_code_line_info(code_obj, _cache={}) -> _CodeLineInfo:
 # ENDIF
 # fmt: on
     try:
@@ -460,7 +497,7 @@ def _get_code_line_info(code_obj, _cache={}):
         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):
@@ -832,32 +869,30 @@ def _unwind_event(code, instruction, exc):
         if thread_info is None:
             return
 
-    frame = _getframe(1)
-    arg = (type(exc), exc, exc.__traceback__)
-
     py_db: object = GlobalDebuggerHolder.global_dbg
     if py_db is None or py_db.pydb_disposed:
         return
 
-    if not thread_info.trace or not is_thread_alive(thread_info.thread):
+    if not thread_info.trace or not thread_info.is_thread_alive():
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
-    
+
     func_code_info: FuncCodeInfo = _get_func_code_info(code, 1)
     if func_code_info.always_skip_code:
         return
-    
+
     # print('_unwind_event', code, exc)
+    frame = _getframe(1)
+    arg = (type(exc), exc, exc.__traceback__)
 
     has_caught_exception_breakpoint_in_pydb = (
         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
+            py_db, thread_info.additional_info, frame, thread_info.thread, arg, None, is_unwind=True
         )
         if user_uncaught_exc_info:
             # TODO: Check: this may no longer be needed as in the unwind we know it's
@@ -871,13 +906,14 @@ def _unwind_event(code, instruction, exc):
             )
 
             if is_unhandled:
-                # print('stop in user uncaught')
                 handle_exception(py_db, thread_info.thread, frame, user_uncaught_exc_info[0], EXCEPTION_TYPE_USER_UNHANDLED)
                 return
 
     break_on_uncaught_exceptions = py_db.break_on_uncaught_exceptions
-    if break_on_uncaught_exceptions and _is_last_user_frame(frame):
-        stop_on_unhandled_exception(py_db, thread_info.thread, thread_info.additional_info, arg)
+    if break_on_uncaught_exceptions:
+        if frame is _get_unhandled_exception_frame(exc, 1):
+            stop_on_unhandled_exception(py_db, thread_info.thread, thread_info.additional_info, arg)
+            return
 
 
 # fmt: off
@@ -905,15 +941,12 @@ def _raise_event(code, instruction, exc):
         thread_info = _get_thread_info(True, 1)
         if thread_info is None:
             return
-
-    frame = _getframe(1)
-    arg = (type(exc), exc, exc.__traceback__)
-
+        
     py_db: object = GlobalDebuggerHolder.global_dbg
     if py_db is None or py_db.pydb_disposed:
         return
 
-    if not thread_info.trace or not is_thread_alive(thread_info.thread):
+    if not thread_info.trace or not thread_info.is_thread_alive():
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -922,7 +955,8 @@ def _raise_event(code, instruction, exc):
     if func_code_info.always_skip_code:
         return
 
-    # print('_raise_event --- ', code, exc)
+    frame = _getframe(1)
+    arg = (type(exc), exc, exc.__traceback__)
 
     # Compute the previous exception info (if any). We use it to check if the exception
     # should be stopped
@@ -938,10 +972,6 @@ def _raise_event(code, instruction, exc):
     if should_stop:
         handle_exception(py_db, thread_info.thread, frame, arg, EXCEPTION_TYPE_HANDLED)
 
-    # Once we leave the raise event, we are no longer in the state of 'just_raised', so 
-    # indicate that this traceback is for an exception in the unwinding state
-    flag_as_unwinding(exc.__traceback__)
-
 
 # fmt: off
 # IFDEF CYTHON
@@ -1031,7 +1061,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 not is_thread_alive(thread_info.thread):
+    if not thread_info.trace or not thread_info.is_thread_alive():
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -1342,7 +1372,11 @@ 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 not is_thread_alive(thread_info.thread):
+    # If we get another jump event, remove the extra check for the line event
+    if hasattr(_thread_local_info, "f_disable_next_line_if_match"):
+        del _thread_local_info.f_disable_next_line_if_match
+
+    if not thread_info.trace or not thread_info.is_thread_alive():
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
@@ -1358,9 +1392,8 @@ def _jump_event(code, from_offset, to_offset):
     if to_offset > from_offset:
         return monitor.DISABLE
 
-    from_line = func_code_info.get_line_of_offset(from_offset)
-    to_line = func_code_info.get_line_of_offset(to_offset)
-    # print('jump event', code.co_name, 'from line', from_line, 'to line', to_line)
+    from_line = func_code_info.get_line_of_offset(from_offset or 0)
+    to_line = func_code_info.get_line_of_offset(to_offset or 0)
 
     if from_line != to_line:
         # I.e.: use case: "yield from [j for j in a if j % 2 == 0]"
@@ -1370,7 +1403,8 @@ def _jump_event(code, from_offset, to_offset):
     frame = _getframe(1)
 
     # Disable the next line event as we're jumping to a line. The line event will be redundant.
-    _thread_local_info.f_disable_next_line_if_match = frame.f_lineno
+    _thread_local_info.f_disable_next_line_if_match = (func_code_info.co_filename, frame.f_lineno)
+    # pydev_log.debug('_jump_event', code.co_name, 'from line', from_line, 'to line', frame.f_lineno)
 
     return _internal_line_event(func_code_info, frame, frame.f_lineno)
 
@@ -1399,24 +1433,26 @@ def _line_event(code, line):
     if py_db is None or py_db.pydb_disposed:
         return monitor.DISABLE
 
-    if not thread_info.trace or not is_thread_alive(thread_info.thread):
+    # If we get another line event, remove the extra check for the line event
+    if hasattr(_thread_local_info, "f_disable_next_line_if_match"):
+        (co_filename, line_to_skip) = _thread_local_info.f_disable_next_line_if_match
+        del _thread_local_info.f_disable_next_line_if_match
+        if line_to_skip is line and co_filename == code.co_filename:
+            # The last jump already jumped to this line and we haven't had any
+            # line events or jumps since then. We don't want to consider this line twice
+            # pydev_log.debug('_line_event skipped', line)
+            return
+
+    if not thread_info.trace or not thread_info.is_thread_alive():
         # For thread-related stuff we can't disable the code tracing because other
         # threads may still want it...
         return
     
-    if hasattr(_thread_local_info, "f_disable_next_line_if_match"):
-        if _thread_local_info.f_disable_next_line_if_match is line:
-            # If we're in a jump, we should skip this line event. The jump would have
-            # been considered a line event for this same line and we don't want to
-            # stop twice.
-            del _thread_local_info.f_disable_next_line_if_match
-            return
-
     func_code_info: FuncCodeInfo = _get_func_code_info(code, 1)
     if func_code_info.always_skip_code or func_code_info.always_filtered_out:
         return monitor.DISABLE
 
-    # print('line event', code.co_name, line)
+    # pydev_log.debug('_line_event', code.co_name, line)
 
     # We know the frame depth.
     frame = _getframe(1)
@@ -1646,12 +1682,11 @@ 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 not is_thread_alive(thread_info.thread):
+    if not thread_info.trace or not thread_info.is_thread_alive():
         # For thread-related stuff we can't disable the code tracing because other
         # 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:
@@ -1699,6 +1734,7 @@ def _start_method_event(code, instruction_offset):
 
     return monitor.DISABLE
 
+
 # fmt: off
 # IFDEF CYTHON
 # cpdef _ensure_monitoring():
@@ -1771,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.
 
@@ -1843,7 +1879,10 @@ def update_monitor_events(suspend_requested: Optional[bool] = None) -> None:
         monitor.register_callback(DEBUGGER_ID, monitor.events.PY_START, _start_method_event)
         # monitor.register_callback(DEBUGGER_ID, monitor.events.PY_RESUME, _resume_method_event)
         monitor.register_callback(DEBUGGER_ID, monitor.events.LINE, _line_event)
-        monitor.register_callback(DEBUGGER_ID, monitor.events.JUMP, _jump_event)
+        if not IS_PY313_OR_GREATER:
+            # In Python 3.13+ jump_events aren't necessary as we have a line_event for every
+            # jump location. 
+            monitor.register_callback(DEBUGGER_ID, monitor.events.JUMP, _jump_event)
         monitor.register_callback(DEBUGGER_ID, monitor.events.PY_RETURN, _return_event)
 
     else:
@@ -1899,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