Support 3.13 in PyDev.Debugger

.github/workflows/pydevd-tests-python.yml

@@ -24,6 +24,8 @@ jobs:
           "ubuntu-py311-cython",
           "ubuntu-py312-cython-checkbin",
           "windows-py312-cython-checkbin",
+          "ubuntu-py313-cython",
+          "windows-py313-cython",
         ]
 
         include:
@@ -64,6 +66,14 @@ jobs:
             python: "3.12"
             os: windows-latest
             PYDEVD_USE_CYTHON: YES
+          - name: "ubuntu-py313"
+            python: "3.13.0"
+            os: ubuntu-20.04
+            PYDEVD_USE_CYTHON: YES
+          - name: "windows-py313-cython"
+            python: "3.13"
+            os: windows-latest
+            PYDEVD_USE_CYTHON: YES
 
     steps:
     - uses: actions/checkout@v1

_pydev_bundle/pydev_is_thread_alive.py

@@ -4,7 +4,11 @@
 # circumstances).
 # It is required to debug threads started by start_new_thread in Python 3.4
 _temp = threading.Thread()
-if hasattr(_temp, "_is_stopped"):  # Python 3.x has this
+if hasattr(_temp, "_handle") and hasattr(_temp, "_started"):
+    # Python 3.13 and later has this
+    def is_thread_alive(t):
+        return not t._handle.is_done() and t._started.is_set()
+if hasattr(_temp, "_is_stopped"):  # Python 3.12 and earlier has this
 
     def is_thread_alive(t):
         return not t._is_stopped

_pydev_bundle/pydev_monkey.py

@@ -4,6 +4,7 @@
 import sys
 from _pydev_bundle._pydev_saved_modules import threading
 from _pydevd_bundle.pydevd_constants import (
+    IS_PY313_OR_GREATER,
     get_global_debugger,
     IS_WINDOWS,
     IS_JYTHON,
@@ -1173,11 +1174,13 @@ def _get_threading_modules_to_patch():
 
 
 def patch_thread_module(thread_module):
+    attr = "_start_joinable_thread" if IS_PY313_OR_GREATER else "_start_new_thread"
+    is_start_joinable = thread_module is threading and IS_PY313_OR_GREATER
     if getattr(thread_module, "_original_start_new_thread", None) is None:
         if thread_module is threading:
-            if not hasattr(thread_module, "_start_new_thread"):
+            if not hasattr(thread_module, attr):
                 return  # Jython doesn't have it.
-            _original_start_new_thread = thread_module._original_start_new_thread = thread_module._start_new_thread
+            _original_start_new_thread = thread_module._original_start_new_thread = getattr(thread_module, attr)
         else:
             _original_start_new_thread = thread_module._original_start_new_thread = thread_module.start_new_thread
     else:
@@ -1191,6 +1194,16 @@ def pydev_start_new_thread(self, function, args=(), kwargs={}):
             """
             return _original_start_new_thread(_UseNewThreadStartup(function, args, kwargs), ())
 
+    class ClassWithPydevStartJoinableThread:
+        def pydev_start_joinable_thread(self, function, *args, **kwargs):
+            """
+            We need to replace the original thread_module._start_joinable_thread with this function so that threads started
+            through it and not through the threading module are properly traced.
+            """
+            handle = kwargs.pop("handle", None)
+            daemon = kwargs.pop("daemon", True)
+            return _original_start_new_thread(_UseNewThreadStartup(function, args, kwargs), handle=handle, daemon=daemon)
+
     # This is a hack for the situation where the thread_module.start_new_thread is declared inside a class, such as the one below
     # class F(object):
     #    start_new_thread = thread_module.start_new_thread
@@ -1199,13 +1212,17 @@ def pydev_start_new_thread(self, function, args=(), kwargs={}):
     #        self.start_new_thread(self.function, args, kwargs)
     # So, if it's an already bound method, calling self.start_new_thread won't really receive a different 'self' -- it
     # does work in the default case because in builtins self isn't passed either.
-    pydev_start_new_thread = ClassWithPydevStartNewThread().pydev_start_new_thread
+    pydev_start_new_thread = (
+        ClassWithPydevStartJoinableThread().pydev_start_joinable_thread
+        if is_start_joinable
+        else ClassWithPydevStartNewThread().pydev_start_new_thread
+    )
 
     try:
         # We need to replace the original thread_module.start_new_thread with this function so that threads started through
         # it and not through the threading module are properly traced.
         if thread_module is threading:
-            thread_module._start_new_thread = pydev_start_new_thread
+            setattr(thread_module, attr, pydev_start_new_thread)
         else:
             thread_module.start_new_thread = pydev_start_new_thread
             thread_module.start_new = pydev_start_new_thread

_pydevd_bundle/pydevd_additional_thread_info_regular.py

@@ -10,6 +10,7 @@
 )
 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
@@ -135,7 +136,7 @@ def _get_related_thread(self):
         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?

_pydevd_bundle/pydevd_collect_bytecode_info.py

@@ -846,6 +846,8 @@ def _create_msg_part(self, instruction, tok=None, line=None):
         argrepr = instruction.argrepr
         if isinstance(argrepr, str) and argrepr.startswith("NULL + "):
             argrepr = argrepr[7:]
+        if isinstance(argrepr, str) and argrepr.endswith("+ NULL"):
+            argrepr = argrepr[:-7]
         return _MsgPart(line, tok if tok is not None else dec(instruction, argrepr))
 
     def _next_instruction_to_str(self, line_to_contents):

_pydevd_bundle/pydevd_comm.py

@@ -1140,7 +1140,8 @@ def internal_get_next_statement_targets(dbg, seq, thread_id, frame_id):
                 xml += "<line>%d</line>" % (frame.f_lineno,)
             else:
                 for _, line in linestarts:
-                    xml += "<line>%d</line>" % (line,)
+                    if line is not None:
+                        xml += "<line>%d</line>" % (line,)
             del frame
             xml += "</xml>"
             cmd = dbg.cmd_factory.make_get_next_statement_targets_message(seq, xml)

_pydevd_bundle/pydevd_constants.py

@@ -174,9 +174,10 @@ def _current_frames():
 IS_PY311_OR_GREATER = sys.version_info >= (3, 11)
 IS_PY312_OR_GREATER = sys.version_info >= (3, 12)
 IS_PY313_OR_GREATER = sys.version_info >= (3, 13)
+IS_PY314_OR_GREATER = sys.version_info >= (3, 14)
 
 # Not currently supported in Python 3.12.
-SUPPORT_ATTACH_TO_PID = not IS_PY313_OR_GREATER
+SUPPORT_ATTACH_TO_PID = not IS_PY314_OR_GREATER
 
 
 def version_str(v):