debugpy 1.8.12__tar.gz → 1.8.14__tar.gz

{debugpy-1.8.12/src/debugpy.egg-info → debugpy-1.8.14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: debugpy
-Version: 1.8.12
+Version: 1.8.14
 Summary: An implementation of the Debug Adapter Protocol for Python
 Home-page: https://aka.ms/debugpy
 Author: Microsoft Corporation
@@ -28,6 +28,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary

{debugpy-1.8.12 → debugpy-1.8.14}/setup.py

@@ -196,6 +196,11 @@ if __name__ == "__main__":
         has_ext_modules=lambda: True,
         cmdclass=cmds,
         # allow the user to call "debugpy" instead of "python -m debugpy"
-        entry_points={"console_scripts": ["debugpy = debugpy.server.cli:main"]},
+        entry_points={
+            "console_scripts": [
+                "debugpy = debugpy.server.cli:main",
+                "debugpy-adapter = debugpy.adapter.__main__:main",
+            ],
+        },
         **extras
     )

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/_pydev_bundle/pydev_monkey.py

@@ -1022,6 +1022,9 @@ def patch_new_process_functions():
     monkey_patch_os("spawnvpe", create_spawnve)
     monkey_patch_os("posix_spawn", create_posix_spawn)
 
+    if not IS_WINDOWS:
+        monkey_patch_os("posix_spawnp", create_posix_spawn)
+
     if not IS_JYTHON:
         if not IS_WINDOWS:
             monkey_patch_os("fork", create_fork)

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_comm.py

@@ -934,7 +934,7 @@ def internal_change_variable_json(py_db, request):
         )
         return
 
-    child_var = variable.change_variable(arguments.name, arguments.value, py_db, fmt=fmt)
+    child_var = variable.change_variable(arguments.name, arguments.value, py_db, fmt=fmt, scope=scope)
 
     if child_var is None:
         _write_variable_response(py_db, request, value="", success=False, message="Unable to change: %s." % (arguments.name,))

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_net_command.py

@@ -77,7 +77,10 @@ class NetCommand(_BaseNetCommand):
             as_dict["pydevd_cmd_id"] = cmd_id
             as_dict["seq"] = seq
             self.as_dict = as_dict
-            text = json.dumps(as_dict)
+            try:
+                text = json.dumps(as_dict)
+            except TypeError:
+                text = json.dumps(as_dict, default=str)
 
         assert isinstance(text, str)
 

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_plugin_utils.py

@@ -199,9 +199,9 @@ class PluginManager(object):
 
         return None
 
-    def change_variable(self, frame, attr, expression):
+    def change_variable(self, frame, attr, expression, scope=None):
         for plugin in self.active_plugins:
-            ret = plugin.change_variable(frame, attr, expression, self.EMPTY_SENTINEL)
+            ret = plugin.change_variable(frame, attr, expression, self.EMPTY_SENTINEL, scope)
             if ret is not self.EMPTY_SENTINEL:
                 return ret
 

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_suspended_frames.py

@@ -200,7 +200,7 @@ class _ObjectVariable(_AbstractVariable):
 
         return children_variables
 
-    def change_variable(self, name, value, py_db, fmt=None):
+    def change_variable(self, name, value, py_db, fmt=None, scope: Optional[ScopeRequest]=None):
         children_variable = self.get_child_variable_named(name)
         if children_variable is None:
             return None
@@ -255,12 +255,10 @@ class _FrameVariable(_AbstractVariable):
         self._register_variable = register_variable
         self._register_variable(self)
 
-    def change_variable(self, name, value, py_db, fmt=None):
+    def change_variable(self, name, value, py_db, fmt=None, scope: Optional[ScopeRequest]=None):
         frame = self.frame
-
-        pydevd_vars.change_attr_expression(frame, name, value, py_db)
-
-        return self.get_child_variable_named(name, fmt=fmt)
+        pydevd_vars.change_attr_expression(frame, name, value, py_db, scope=scope)
+        return self.get_child_variable_named(name, fmt=fmt, scope=scope)
 
     @silence_warnings_decorator
     @overrides(_AbstractVariable.get_children_variables)

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_vars.py

@@ -15,11 +15,12 @@ import sys  # @Reimport
 from _pydev_bundle._pydev_saved_modules import threading
 from _pydevd_bundle import pydevd_save_locals, pydevd_timeout, pydevd_constants
 from _pydev_bundle.pydev_imports import Exec, execfile
-from _pydevd_bundle.pydevd_utils import to_string
+from _pydevd_bundle.pydevd_utils import to_string, ScopeRequest
 import inspect
 from _pydevd_bundle.pydevd_daemon_thread import PyDBDaemonThread
 from _pydevd_bundle.pydevd_save_locals import update_globals_and_locals
 from functools import lru_cache
+from typing import Optional
 
 SENTINEL_VALUE = []
 
@@ -595,11 +596,15 @@ def evaluate_expression(py_db, frame, expression, is_exec):
         del frame
 
 
-def change_attr_expression(frame, attr, expression, dbg, value=SENTINEL_VALUE):
+def change_attr_expression(frame, attr, expression, dbg, value=SENTINEL_VALUE, /, scope: Optional[ScopeRequest]=None):
     """Changes some attribute in a given frame."""
     if frame is None:
         return
 
+    if scope is not None:
+        assert isinstance(scope, ScopeRequest)
+        scope = scope.scope
+
     try:
         expression = expression.replace("@LINE@", "\n")
 
@@ -608,13 +613,15 @@ def change_attr_expression(frame, attr, expression, dbg, value=SENTINEL_VALUE):
             if result is not dbg.plugin.EMPTY_SENTINEL:
                 return result
 
-        if attr[:7] == "Globals":
-            attr = attr[8:]
+        if attr[:7] == "Globals" or scope == "globals":
+            attr = attr[8:] if attr.startswith("Globals") else attr
             if attr in frame.f_globals:
                 if value is SENTINEL_VALUE:
                     value = eval(expression, frame.f_globals, frame.f_locals)
                 frame.f_globals[attr] = value
                 return frame.f_globals[attr]
+            else:
+                raise VariableError("Attribute %s not found in globals" % attr)
         else:
             if "." not in attr:  # i.e.: if we have a '.', we're changing some attribute of a local var.
                 if pydevd_save_locals.is_save_locals_available():
@@ -631,8 +638,9 @@ def change_attr_expression(frame, attr, expression, dbg, value=SENTINEL_VALUE):
             Exec("%s=%s" % (attr, expression), frame.f_globals, frame.f_locals)
             return result
 
-    except Exception:
-        pydev_log.exception()
+    except Exception as e:
+        pydev_log.exception(e)
+    
 
 
 MAXIMUM_ARRAY_SIZE = 100

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/pydevd.py

@@ -726,6 +726,8 @@ class PyDB(object):
 
         self._local_thread_trace_func = threading.local()
 
+        self._client_socket = None
+
         self._server_socket_ready_event = ThreadingEvent()
         self._server_socket_name = None
 
@@ -1504,6 +1506,7 @@ class PyDB(object):
     def connect(self, host, port):
         if host:
             s = start_client(host, port)
+            self._client_socket = s
         else:
             s = start_server(port)
 
@@ -2551,6 +2554,10 @@ class PyDB(object):
             except:
                 pass
         finally:
+            if self._client_socket:
+                self._client_socket.close()
+                self._client_socket = None
+
             pydev_log.debug("PyDB.dispose_and_kill_all_pydevd_threads: finished")
 
     def prepare_to_run(self):

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_linux.sh

@@ -8,4 +8,4 @@ case $ARCH in
 esac
 
 SRC="$(dirname "$0")/.."
-g++ -std=c++11 -shared -fPIC -nostartfiles $SRC/linux_and_mac/attach.cpp -o $SRC/attach_linux_$SUFFIX.so
+g++ -std=c++11 -shared -fPIC -O2 -D_FORTIFY_SOURCE=2 -nostartfiles --stack-protector-strong $SRC/linux_and_mac/attach.cpp -o $SRC/attach_linux_$SUFFIX.so

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_mac.sh

@@ -1,4 +1,4 @@
 set -e
 SRC="$(dirname "$0")/.."
-g++ -fPIC -D_REENTRANT -std=c++11 -arch x86_64 -c $SRC/linux_and_mac/attach.cpp -o $SRC/attach_x86_64.o
+g++ -fPIC -D_REENTRANT -std=c++11 -D_FORTIFY_SOURCE=2 -arch x86_64 -c $SRC/linux_and_mac/attach.cpp -o $SRC/attach_x86_64.o
 g++ -dynamiclib -nostartfiles -arch x86_64 -lc $SRC/attach_x86_64.o -o $SRC/attach_x86_64.dylib

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_manylinux.cmd

@@ -5,6 +5,6 @@
 ::   [wsl2]
 ::   kernelCommandLine = vsyscall=emulate
 
-docker run --rm -v %~dp0/..:/src quay.io/pypa/manylinux1_x86_64 g++ -std=c++11 -shared -o /src/attach_linux_amd64.so -fPIC -nostartfiles /src/linux_and_mac/attach.cpp
+docker run --rm -v %~dp0/..:/src quay.io/pypa/manylinux1_x86_64 g++ -std=c++11 -D_FORTIFY_SOURCE=2 -shared -o /src/attach_linux_amd64.so -fPIC -nostartfiles /src/linux_and_mac/attach.cpp
 
-docker run --rm -v %~dp0/..:/src quay.io/pypa/manylinux1_i686 g++ -std=c++11 -shared -o /src/attach_linux_x86.so -fPIC -nostartfiles /src/linux_and_mac/attach.cpp
+docker run --rm -v %~dp0/..:/src quay.io/pypa/manylinux1_i686 g++ -std=c++11 -D_FORTIFY_SOURCE=2 -shared -o /src/attach_linux_x86.so -fPIC -nostartfiles /src/linux_and_mac/attach.cpp

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/pydevd_plugins/django_debug.py

@@ -427,10 +427,10 @@ class DjangoTemplateSyntaxErrorFrame(object):
         self.f_trace = None
 
 
-def change_variable(frame, attr, expression, default):
+def change_variable(frame, attr, expression, default, scope=None):
     if isinstance(frame, DjangoTemplateFrame):
         result = eval(expression, frame.f_globals, frame.f_locals)
-        frame._change_variable(attr, result)
+        frame._change_variable(attr, result, scope=scope)
         return result
     return default
 

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/pydevd_plugins/jinja2_debug.py

@@ -249,10 +249,10 @@ class Jinja2TemplateSyntaxErrorFrame(object):
         self.f_trace = None
 
 
-def change_variable(frame, attr, expression, default):
+def change_variable(frame, attr, expression, default, scope=None):
     if isinstance(frame, Jinja2TemplateFrame):
         result = eval(expression, frame.f_globals, frame.f_locals)
-        frame._change_variable(frame.f_back, attr, result)
+        frame._change_variable(frame.f_back, attr, result, scope=scope)
         return result
     return default
 

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_vendored/pydevd/setup_pydevd_cython.py

@@ -207,6 +207,8 @@ def build_extension(dir_name, extension_name, target_pydevd_name, force_cython,
             # uncomment to generate pdbs for visual studio.
             # extra_compile_args=["-Zi", "/Od"]
             # extra_link_args=["-debug"]
+            extra_compile_args = ["/guard:cf"]
+            extra_link_args = ["/guard:cf", "/DYNAMICBASE"]
             if IS_PY311_ONWARDS:
                 # On py311 we need to add the CPython include folder to the include path.
                 extra_compile_args.append("-I%s\\include\\CPython" % sys.exec_prefix)

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-01-15T09:42:03-0800",
+ "date": "2025-04-10T11:38:49-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "40a471e24aa9015e2b1a40449a24af3053f7566d",
- "version": "1.8.12"
+ "full-revisionid": "8b5b84aec3d4ca6fcc5d17edff5627ba19f7d9e6",
+ "version": "1.8.14"
 }
 '''  # END VERSION_JSON
 

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/adapter/__main__.py

@@ -13,7 +13,9 @@ import sys
 # and should be imported locally inside main() instead.
 
 
-def main(args):
+def main():
+    args = _parse_argv(sys.argv)
+
     # If we're talking DAP over stdio, stderr is not guaranteed to be read from,
     # so disable it to avoid the pipe filling and locking up. This must be done
     # as early as possible, before the logging module starts writing to it.
@@ -230,4 +232,4 @@ if __name__ == "__main__":
         # the default "C" locale if so.
         pass
 
-    main(_parse_argv(sys.argv))
+    main()

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy/adapter/clients.py

@@ -191,6 +191,7 @@ class Client(components.Component):
             "supportsSetExpression": True,
             "supportsSetVariable": True,
             "supportsValueFormattingOptions": True,
+            "supportsTerminateDebuggee": True,
             "supportsTerminateRequest": True,
             "supportsGotoTargetsRequest": True,
             "supportsClipboardContext": True,
@@ -699,6 +700,12 @@ class Client(components.Component):
                 except Exception:
                     log.swallow_exception()
 
+        # Close the client channel since we disconnected from the client.
+        try:
+            self.channel.close()
+        except Exception:
+            log.swallow_exception(level="warning")
+
     def disconnect(self):
         super().disconnect()
 

{debugpy-1.8.12 → debugpy-1.8.14/src/debugpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: debugpy
-Version: 1.8.12
+Version: 1.8.14
 Summary: An implementation of the Debug Adapter Protocol for Python
 Home-page: https://aka.ms/debugpy
 Author: Microsoft Corporation
@@ -28,6 +28,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary

{debugpy-1.8.12 → debugpy-1.8.14}/src/debugpy.egg-info/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 debugpy = debugpy.server.cli:main
+debugpy-adapter = debugpy.adapter.__main__:main