debugpy 1.8.7__zip → 1.8.8__zip

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py

@@ -308,7 +308,7 @@ def run_python_code_windows(pid, python_code, connect_debugger_tracing=False, sh
                 args = [target_executable, str(pid), target_dll_run_on_dllmain]
                 subprocess.check_call(args)
 
-                if not event.wait_for_event_set(30):
+                if not event.wait_for_event_set(15):
                     print("Timeout error: the attach may not have completed.")
                     sys.stdout.flush()
             print("--- Finished dll injection ---\n")

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/attach_script.py

@@ -81,6 +81,10 @@ def fix_main_thread_id(on_warn=lambda msg: None, on_exception=lambda msg: None,
     import sys
     import threading
 
+    # This is no longer needed in Py 3.13 (as the related issue is already fixed).
+    if sys.version_info[:2] >= (3, 13):
+        return
+
     try:
         with threading._active_limbo_lock:
             main_thread_instance = get_main_thread_instance(threading)

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/common/py_settrace.hpp

@@ -127,20 +127,20 @@ int InternalSetSysTraceFunc(
         pyUnicode_InternFromString = stringFromString;
     }
 
-    DEFINE_PROC_NO_CHECK(pyObject_FastCallDict, _PyObject_FastCallDict*, "_PyObject_FastCallDict", 530);
-    DEFINE_PROC(pyTuple_New, PyTuple_New*, "PyTuple_New", 531);
-    DEFINE_PROC(pyEval_CallObjectWithKeywords, PyEval_CallObjectWithKeywords*, "PyEval_CallObjectWithKeywords", 532);
-
-    if(pyObject_FastCallDict == nullptr) {
-        DEFINE_PROC_NO_CHECK(pyObject_VectorcallDict, _PyObject_FastCallDict*, "PyObject_VectorcallDict", 533);
-        pyObject_FastCallDict = pyObject_VectorcallDict;
-    }
-                                                                                                         
-    if(pyObject_FastCallDict == nullptr) {
-        // we have to use PyObject_FastCallDictCustom for older versions of CPython (pre 3.7).
+    _PyObject_FastCallDict* pyObject_FastCallDict;
+    if (version < PythonVersion_37) {
         pyObject_FastCallDict = reinterpret_cast<_PyObject_FastCallDict*>(&PyObject_FastCallDictCustom);
+    } else if (version < PythonVersion_39) {
+        DEFINE_PROC(fastCallDict, _PyObject_FastCallDict*, "_PyObject_FastCallDict", 530);
+        pyObject_FastCallDict = fastCallDict;
+    } else {
+        DEFINE_PROC(vectorcallDict, _PyObject_FastCallDict*, "PyObject_VectorcallDict", 530);
+        pyObject_FastCallDict = vectorcallDict;
     }
 
+    DEFINE_PROC(pyTuple_New, PyTuple_New*, "PyTuple_New", 531);
+    DEFINE_PROC(pyEval_CallObjectWithKeywords, PyEval_CallObjectWithKeywords*, "PyEval_CallObjectWithKeywords", 532);
+
 
     DEFINE_PROC(pyTraceBack_Here, PyTraceBack_Here*, "PyTraceBack_Here", 540);
     DEFINE_PROC(pyEval_SetTrace, PyEval_SetTrace*, "PyEval_SetTrace", 550);

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/attach.cpp

@@ -108,8 +108,8 @@ struct InitializeThreadingInfo {
     PyEval_Lock* initThreads;
 
     CRITICAL_SECTION cs;
-    HANDLE initedEvent;  // Note: only access with cs locked (and check if not already nullptr).
-    bool completed; // Note: only access with cs locked
+    HANDLE initedEvent;  // Note: only access with mutex locked (and check if not already nullptr).
+    bool completed; // Note: only access with mutex locked
 };
 
 
@@ -322,7 +322,6 @@ extern "C"
             return -240;
         }
 
-
         // Either _Py_CheckInterval or _PyEval_[GS]etSwitchInterval are useful, but not required
         DEFINE_PROC_NO_CHECK(intervalCheck, int*, "_Py_CheckInterval", -250);  // optional
         DEFINE_PROC_NO_CHECK(getSwitchInterval, _PyEval_GetSwitchInterval*, "_PyEval_GetSwitchInterval", -260);  // optional
@@ -375,7 +374,6 @@ extern "C"
         initializeThreadingInfo->initedEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
         InitializeCriticalSection(&initializeThreadingInfo->cs);
 
-
         // Add the call to initialize threading.
         addPendingCall(&AttachCallback, initializeThreadingInfo);
 

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat

@@ -1,6 +1,4 @@
 :: This script compiles the attach and inject DLLs for x86 and x64 architectures.
-:: It runs as part of the PR checks in the debugpy repo, AND the artifacts are uploaded to github,
-:: so you don't have to run it locally.
 
 setlocal
 @cd /d %~dp0
@@ -12,29 +10,29 @@ setlocal
                                  
 call "%VSDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86 -vcvars_spectre_libs=spectre
 
-cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /out:attach_x86.dll
+cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:attach_x86.dll
 copy attach_x86.dll ..\attach_x86.dll /Y
 copy attach_x86.pdb ..\attach_x86.pdb /Y
 
-cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_32 /Qspectre run_code_on_dllmain.cpp /link /PROFILE /GUARD:CF /out:run_code_on_dllmain_x86.dll
+cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_32 /Qspectre run_code_on_dllmain.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:run_code_on_dllmain_x86.dll
 copy run_code_on_dllmain_x86.dll ..\run_code_on_dllmain_x86.dll /Y
 copy run_code_on_dllmain_x86.pdb ..\run_code_on_dllmain_x86.pdb /Y
 
-cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /out:inject_dll_x86.exe
+cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:inject_dll_x86.exe
 copy inject_dll_x86.exe ..\inject_dll_x86.exe /Y
 copy inject_dll_x86.pdb ..\inject_dll_x86.pdb /Y
 
 call "%VSDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 -vcvars_spectre_libs=spectre
 
-cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /out:attach_amd64.dll
+cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:attach_amd64.dll
 copy attach_amd64.dll ..\attach_amd64.dll /Y
 copy attach_amd64.pdb ..\attach_amd64.pdb /Y
 
-cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_64 /Qspectre run_code_on_dllmain.cpp /link /PROFILE /GUARD:CF /out:run_code_on_dllmain_amd64.dll
+cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_64 /Qspectre run_code_on_dllmain.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:run_code_on_dllmain_amd64.dll
 copy run_code_on_dllmain_amd64.dll ..\run_code_on_dllmain_amd64.dll /Y
 copy run_code_on_dllmain_amd64.pdb ..\run_code_on_dllmain_amd64.pdb /Y
 
-cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /out:inject_dll_amd64.exe
+cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:inject_dll_amd64.exe
 copy inject_dll_amd64.exe ..\inject_dll_amd64.exe /Y
 copy inject_dll_amd64.pdb ..\inject_dll_amd64.pdb /Y
 

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_file_utils.py

@@ -1,44 +1,44 @@
 r"""
-    This module provides utilities to get the absolute filenames so that we can be sure that:
-        - The case of a file will match the actual file in the filesystem (otherwise breakpoints won't be hit).
-        - Providing means for the user to make path conversions when doing a remote debugging session in
-          one machine and debugging in another.
+This module provides utilities to get the absolute filenames so that we can be sure that:
+    - The case of a file will match the actual file in the filesystem (otherwise breakpoints won't be hit).
+    - Providing means for the user to make path conversions when doing a remote debugging session in
+      one machine and debugging in another.
 
-    To do that, the PATHS_FROM_ECLIPSE_TO_PYTHON constant must be filled with the appropriate paths.
+To do that, the PATHS_FROM_ECLIPSE_TO_PYTHON constant must be filled with the appropriate paths.
 
-    @note:
-        in this context, the server is where your python process is running
-        and the client is where eclipse is running.
+@note:
+    in this context, the server is where your python process is running
+    and the client is where eclipse is running.
 
-    E.g.:
-        If the server (your python process) has the structure
-            /user/projects/my_project/src/package/module1.py
+E.g.:
+    If the server (your python process) has the structure
+        /user/projects/my_project/src/package/module1.py
 
-        and the client has:
-            c:\my_project\src\package\module1.py
+    and the client has:
+        c:\my_project\src\package\module1.py
 
-        the PATHS_FROM_ECLIPSE_TO_PYTHON would have to be:
-            PATHS_FROM_ECLIPSE_TO_PYTHON = [(r'c:\my_project\src', r'/user/projects/my_project/src')]
+    the PATHS_FROM_ECLIPSE_TO_PYTHON would have to be:
+        PATHS_FROM_ECLIPSE_TO_PYTHON = [(r'c:\my_project\src', r'/user/projects/my_project/src')]
 
-        alternatively, this can be set with an environment variable from the command line:
-           set PATHS_FROM_ECLIPSE_TO_PYTHON=[['c:\my_project\src','/user/projects/my_project/src']]
+    alternatively, this can be set with an environment variable from the command line:
+       set PATHS_FROM_ECLIPSE_TO_PYTHON=[['c:\my_project\src','/user/projects/my_project/src']]
 
-    @note: DEBUG_CLIENT_SERVER_TRANSLATION can be set to True to debug the result of those translations
+@note: DEBUG_CLIENT_SERVER_TRANSLATION can be set to True to debug the result of those translations
 
-    @note: the case of the paths is important! Note that this can be tricky to get right when one machine
-    uses a case-independent filesystem and the other uses a case-dependent filesystem (if the system being
-    debugged is case-independent, 'normcase()' should be used on the paths defined in PATHS_FROM_ECLIPSE_TO_PYTHON).
+@note: the case of the paths is important! Note that this can be tricky to get right when one machine
+uses a case-independent filesystem and the other uses a case-dependent filesystem (if the system being
+debugged is case-independent, 'normcase()' should be used on the paths defined in PATHS_FROM_ECLIPSE_TO_PYTHON).
 
-    @note: all the paths with breakpoints must be translated (otherwise they won't be found in the server)
+@note: all the paths with breakpoints must be translated (otherwise they won't be found in the server)
 
-    @note: to enable remote debugging in the target machine (pydev extensions in the eclipse installation)
-        import pydevd;pydevd.settrace(host, stdoutToServer, stderrToServer, port, suspend)
+@note: to enable remote debugging in the target machine (pydev extensions in the eclipse installation)
+    import pydevd;pydevd.settrace(host, stdoutToServer, stderrToServer, port, suspend)
 
-        see parameter docs on pydevd.py
+    see parameter docs on pydevd.py
 
-    @note: for doing a remote debugging session, all the pydevd_ files must be on the server accessible
-        through the PYTHONPATH (and the PATHS_FROM_ECLIPSE_TO_PYTHON only needs to be set on the target
-        machine for the paths that'll actually have breakpoints).
+@note: for doing a remote debugging session, all the pydevd_ files must be on the server accessible
+    through the PYTHONPATH (and the PATHS_FROM_ECLIPSE_TO_PYTHON only needs to be set on the target
+    machine for the paths that'll actually have breakpoints).
 """
 
 from _pydev_bundle import pydev_log
@@ -963,15 +963,3 @@ def get_package_dir(mod_name):
         if os.path.isdir(mod_path):
             return mod_path
     return None
-
-def contains_dir(path, dir_name):
-    try:
-        while path:
-            path, tail = os.path.split(path)
-            if tail == dir_name:
-                return True
-            if tail is None and path == dir_name:
-                return True
-    except:
-        pass
-    return False

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_plugins/django_debug.py

@@ -586,12 +586,13 @@ def _get_original_filename_from_origin_in_parent_frame_locals(frame, parent_fram
     return filename
 
 
-def exception_break(py_db, frame, thread, arg):
+def exception_break(py_db, frame, thread, arg, is_unwind):
     exception, value, trace = arg
 
     if py_db.django_exception_break and exception is not None:
         if (
             exception.__name__ in ["VariableDoesNotExist", "TemplateDoesNotExist", "TemplateSyntaxError"]
+            and not is_unwind
             and just_raised(trace)
             and not ignore_exception_trace(trace)
         ):

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_plugins/jinja2_debug.py

@@ -494,7 +494,7 @@ def suspend(pydb, thread, frame, bp_type):
     return None
 
 
-def exception_break(pydb, frame, thread, arg):
+def exception_break(pydb, frame, thread, arg, is_unwind):
     exception, value, trace = arg
     if pydb.jinja2_exception_break and exception is not None:
         exception_type = list(pydb.jinja2_exception_break.keys())[0]

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_vendored/pydevd/pydevd_tracing.py

@@ -165,7 +165,10 @@ def get_python_helper_lib_filename():
     # debugger -- the only situation where it's imported is if the user actually does an attach to
     # process, through `attach_pydevd.py`, but this should usually be called from the IDE directly
     # and not from the debugger).
-    libdir = os.path.join(os.path.dirname(__file__), "pydevd_attach_to_process")
+    libdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "pydevd_attach_to_process")
+
+    if not os.path.exists(libdir):
+        pydev_log.critical("Expected the directory: %s to exist!", libdir)
 
     arch = ""
     if IS_WINDOWS:

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-10-10T09:03:34-0700",
+ "date": "2024-11-07T15:11:48-0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "f7d5df027c0407ac02c080bb4c39eab963913bf6",
- "version": "1.8.7"
+ "full-revisionid": "3573ca0e2bb562e8a0d3de68e531c3419a06c82a",
+ "version": "1.8.8"
 }
 '''  # END VERSION_JSON
 

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/adapter/servers.py

@@ -371,7 +371,7 @@ class Server(components.Component):
             session = self.session
             if not session.client or not session.client.is_connected:
                 wait_for_connection(
-                    session, lambda conn: conn.pid == self.pid, timeout=30
+                    session, lambda conn: conn.pid == self.pid, timeout=60
                 )
             else:
                 self.wait_for(
@@ -383,7 +383,7 @@ class Server(components.Component):
                             for conn in session.client.known_subprocesses
                         )
                     ),
-                    timeout=30,
+                    timeout=60,
                 )
         with _lock:
             _connections.remove(self.connection)

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/common/__init__.py

@@ -12,7 +12,7 @@ if typing.TYPE_CHECKING:
 __all__ = []
 
 # The lower time bound for assuming that the process hasn't spawned successfully.
-PROCESS_SPAWN_TIMEOUT = float(os.getenv("DEBUGPY_PROCESS_SPAWN_TIMEOUT", 15)) or None
+PROCESS_SPAWN_TIMEOUT = float(os.getenv("DEBUGPY_PROCESS_SPAWN_TIMEOUT", 60)) or None
 
 # The lower time bound for assuming that the process hasn't exited gracefully.
-PROCESS_EXIT_TIMEOUT = float(os.getenv("DEBUGPY_PROCESS_EXIT_TIMEOUT", 5)) or None
+PROCESS_EXIT_TIMEOUT = float(os.getenv("DEBUGPY_PROCESS_EXIT_TIMEOUT", 30)) or None

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/launcher/debuggee.py

@@ -58,7 +58,8 @@ def spawn(process_name, cmdline, env, redirect_output):
         else:
             kwargs = {}
 
-        if sys.platform != "win32":
+        if sys.platform != "win32" and sys.implementation.name != 'graalpy':
+            # GraalPy does not support running code between fork and exec
 
             def preexec_fn():
                 try:

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy/server/api.py

@@ -168,7 +168,7 @@ def listen(address, settrace_kwargs, in_process_debug_adapter=False):
     server_access_token = codecs.encode(os.urandom(32), "hex").decode("ascii")
 
     try:
-        endpoints_listener = sockets.create_server("127.0.0.1", 0, timeout=10)
+        endpoints_listener = sockets.create_server("127.0.0.1", 0, timeout=30)
     except Exception as exc:
         log.swallow_exception("Can't listen for adapter endpoints:")
         raise RuntimeError("can't listen for adapter endpoints: " + str(exc))

{debugpy-1.8.7 → debugpy-1.8.8/src/debugpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: debugpy
-Version: 1.8.7
+Version: 1.8.8
 Summary: An implementation of the Debug Adapter Protocol for Python
 Home-page: https://aka.ms/debugpy
 Author: Microsoft Corporation

{debugpy-1.8.7 → debugpy-1.8.8}/src/debugpy.egg-info/SOURCES.txt

@@ -154,6 +154,14 @@ src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/concrete.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/flags.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/instr.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/peephole_opt.py
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/COPYING
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/INSTALLER
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/METADATA
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/RECORD
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/REQUESTED
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/WHEEL
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/direct_url.json
+src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode-0.13.0.dev0.dist-info/top_level.txt
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/__init__.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/test_bytecode.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/test_cfg.py

debugpy-1.8.7/src/debugpy/_vendored/pydevd/pydev_ipython/version.py

@@ -1,36 +0,0 @@
-# encoding: utf-8
-"""
-Utilities for version comparison
-
-It is a bit ridiculous that we need these.
-"""
-
-# -----------------------------------------------------------------------------
-#  Copyright (C) 2013  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Imports
-# -----------------------------------------------------------------------------
-
-from distutils.version import LooseVersion
-
-# -----------------------------------------------------------------------------
-# Code
-# -----------------------------------------------------------------------------
-
-
-def check_version(v, check):
-    """check version string v >= check
-
-    If dev/prerelease tags result in TypeError for string-number comparison,
-    it is assumed that the dependency is satisfied.
-    Users on dev branches are responsible for keeping their own packages up to date.
-    """
-    try:
-        return LooseVersion(v) >= LooseVersion(check)
-    except TypeError:
-        return True