debugpy 1.8.0__zip → 1.8.2__zip

{debugpy-1.8.0/src/debugpy.egg-info → debugpy-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: debugpy
-Version: 1.8.0
+Version: 1.8.2
 Summary: An implementation of the Debug Adapter Protocol for Python
 Home-page: https://aka.ms/debugpy
 Author: Microsoft Corporation
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Debuggers
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS

debugpy-1.8.2/pyproject.toml

@@ -0,0 +1,76 @@
+[build-system]
+requires = ["wheel", "setuptools"]
+build-backend = "setuptools.build_meta"
+
+
+[tool.black]
+exclude = '''
+( __pycache__
+| ^/.tox
+| ^/versioneer.py
+| ^/src/debugpy/_vendored
+| ^/src/debugpy/_version.py
+)
+'''
+
+[tool.pyright]
+pythonVersion = "3.8"
+include = ["src/**", "tests/**" ]
+extraPaths = ["src/debugpy/_vendored/pydevd"]
+ignore = ["src/debugpy/_vendored/pydevd", "src/debugpy/_version.py"]
+executionEnvironments = [
+  { root = "src" }, { root = "." }
+]
+
+[tool.ruff]
+# Enable the pycodestyle (`E`) and Pyflakes (`F`) rules by default.
+# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
+# McCabe complexity (`C901`) by default.
+select = ["E", "F"]
+ignore = [
+    "E203", "E221", "E222", "E226", "E261", "E262", "E265", "E266",
+    "E401", "E402",
+    "E501",
+    "E722", "E731" 
+]
+
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+# Exclude a variety of commonly ignored directories.
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "venv",
+    "versioneer.py",
+    "src/debugpy/_vendored/pydevd"
+]
+per-file-ignores = {}
+
+# Same as Black.
+line-length = 88
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+# Assume Python 3.8
+target-version = "py38"

{debugpy-1.8.0 → debugpy-1.8.2}/setup.py

@@ -169,6 +169,7 @@ if __name__ == "__main__":
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: 3.12",
             "Topic :: Software Development :: Debuggers",
             "Operating System :: Microsoft :: Windows",
             "Operating System :: MacOS",
@@ -176,7 +177,14 @@ if __name__ == "__main__":
             "License :: OSI Approved :: MIT License",
         ],
         package_dir={"": "src"},
-        packages=setuptools.find_namespace_packages(where="src", include=["debugpy*"]),
+        packages=[
+            "debugpy",
+            "debugpy.adapter",
+            "debugpy.common",
+            "debugpy.launcher",
+            "debugpy.server",
+            "debugpy._vendored",
+        ],
         package_data={
             "debugpy": ["ThirdPartyNotices.txt"],
             "debugpy._vendored": [

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_safe_repr.py

@@ -20,7 +20,7 @@ class SafeRepr(object):
     # most level, and truncated to maxstring_inner characters inside
     # collections.
     maxstring_outer = 2 ** 16
-    maxstring_inner = 30
+    maxstring_inner = 128
     string_types = (str, bytes)
     bytes = bytes
     set_info = (set, '{', '}', False)
@@ -31,7 +31,7 @@ class SafeRepr(object):
 
     # Collection types are recursively iterated for each limit in
     # maxcollection.
-    maxcollection = (15, 10)
+    maxcollection = (60, 20)
 
     # Specifies type, prefix string, suffix string, and whether to include a
     # comma if there is only one element. (Using a sequence rather than a
@@ -60,7 +60,7 @@ class SafeRepr(object):
     # All other types are treated identically to strings, but using
     # different limits.
     maxother_outer = 2 ** 16
-    maxother_inner = 30
+    maxother_inner = 128
 
     convert_to_hex = False
     raw_value = False

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py

@@ -261,7 +261,13 @@ def get_target_filename(is_target_process_64=None, prefix=None, extension=None):
 
 def run_python_code_windows(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
     assert '\'' not in python_code, 'Having a single quote messes with our command.'
-    from winappdbg.process import Process
+
+    # Suppress winappdbg warning about sql package missing.
+    import warnings
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", category=ImportWarning)
+        from winappdbg.process import Process
+
     if not isinstance(python_code, bytes):
         python_code = python_code.encode('utf-8')
 

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat

@@ -1,3 +1,7 @@
+:: 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
 
@@ -8,29 +12,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 /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:attach_x86.dll
+cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /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 /DEBUG /OPT:REF /OPT:ICF /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 /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 /DEBUG  /OPT:REF /OPT:ICF /GUARD:CF /out:inject_dll_x86.exe
+cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /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 /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:attach_amd64.dll
+cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /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 /DEBUG /OPT:REF /OPT:ICF /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 /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 /DEBUG  /OPT:REF /OPT:ICF /GUARD:CF /out:inject_dll_amd64.exe
+cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /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.2/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py

@@ -0,0 +1,2 @@
+import pkgutil
+__path__ = pkgutil.extend_path(__path__, __name__)

debugpy-1.8.2/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py

@@ -0,0 +1,2 @@
+import pkgutil
+__path__ = pkgutil.extend_path(__path__, __name__)

debugpy-1.8.2/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py

@@ -0,0 +1,2 @@
+import pkgutil
+__path__ = pkgutil.extend_path(__path__, __name__)

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-09-12T11:14:55-0700",
+ "date": "2024-04-19T17:08:26-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "4a03787784c5e44a957317ff82122b6d9227b749",
- "version": "1.8.0"
+ "full-revisionid": "09b5af0bb730e2707ec3bbc14c509523eca116c0",
+ "version": "1.8.2"
 }
 '''  # END VERSION_JSON
 

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/adapter/clients.py

@@ -11,7 +11,7 @@ import sys
 import debugpy
 from debugpy import adapter, common, launcher
 from debugpy.common import json, log, messaging, sockets
-from debugpy.adapter import components, servers, sessions
+from debugpy.adapter import clients, components, launchers, servers, sessions
 
 
 class Client(components.Component):
@@ -110,6 +110,7 @@ class Client(components.Component):
                 "data": {"packageVersion": debugpy.__version__},
             },
         )
+        sessions.report_sockets()
 
     def propagate_after_start(self, event):
         # pydevd starts sending events as soon as we connect, but the client doesn't
@@ -701,6 +702,24 @@ class Client(components.Component):
     def disconnect(self):
         super().disconnect()
 
+    def report_sockets(self):
+        sockets = [
+            {
+                "host": host,
+                "port": port,
+                "internal": listener is not clients.listener,
+            }
+            for listener in [clients.listener, launchers.listener, servers.listener]
+            if listener is not None
+            for (host, port) in [listener.getsockname()]
+        ]
+        self.channel.send_event(
+            "debugpySockets",
+            {
+                "sockets": sockets
+            },
+        )
+
     def notify_of_subprocess(self, conn):
         log.info("{1} is a subprocess of {0}.", self, conn)
         with self.session:
@@ -752,11 +771,16 @@ class Client(components.Component):
 def serve(host, port):
     global listener
     listener = sockets.serve("Client", Client, host, port)
+    sessions.report_sockets()
     return listener.getsockname()
 
 
 def stop_serving():
-    try:
-        listener.close()
-    except Exception:
-        log.swallow_exception(level="warning")
+    global listener
+    if listener is not None:
+        try:
+            listener.close()
+        except Exception:
+            log.swallow_exception(level="warning")
+        listener = None
+    sessions.report_sockets()

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/adapter/launchers.py

@@ -8,7 +8,9 @@ import sys
 
 from debugpy import adapter, common
 from debugpy.common import log, messaging, sockets
-from debugpy.adapter import components, servers
+from debugpy.adapter import components, servers, sessions
+
+listener = None
 
 
 class Launcher(components.Component):
@@ -76,6 +78,8 @@ def spawn_debuggee(
     console_title,
     sudo,
 ):
+    global listener
+
     # -E tells sudo to propagate environment variables to the target process - this
     # is necessary for launcher to get DEBUGPY_LAUNCHER_PORT and DEBUGPY_LOG_DIR.
     cmdline = ["sudo", "-E"] if sudo else []
@@ -101,6 +105,7 @@ def spawn_debuggee(
         raise start_request.cant_handle(
             "{0} couldn't create listener socket for launcher: {1}", session, exc
         )
+    sessions.report_sockets()
 
     try:
         launcher_host, launcher_port = listener.getsockname()
@@ -189,3 +194,5 @@ def spawn_debuggee(
 
     finally:
         listener.close()
+        listener = None
+        sessions.report_sockets()

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/adapter/servers.py

@@ -13,7 +13,7 @@ import time
 import debugpy
 from debugpy import adapter
 from debugpy.common import json, log, messaging, sockets
-from debugpy.adapter import components
+from debugpy.adapter import components, sessions
 import traceback
 import io
 
@@ -394,6 +394,7 @@ class Server(components.Component):
 def serve(host="127.0.0.1", port=0):
     global listener
     listener = sockets.serve("Server", Connection, host, port)
+    sessions.report_sockets()
     return listener.getsockname()
 
 
@@ -409,6 +410,7 @@ def stop_serving():
             listener = None
     except Exception:
         log.swallow_exception(level="warning")
+    sessions.report_sockets()
 
 
 def connections():

{debugpy-1.8.0 → debugpy-1.8.2}/src/debugpy/adapter/sessions.py

@@ -282,3 +282,12 @@ def wait_until_ended():
                 return
             _sessions_changed.clear()
         _sessions_changed.wait()
+
+
+def report_sockets():
+    if not _sessions:
+        return
+    session = sorted(_sessions, key=lambda session: session.id)[0]
+    client = session.client
+    if client is not None:
+        client.report_sockets()

{debugpy-1.8.0 → debugpy-1.8.2/src/debugpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: debugpy
-Version: 1.8.0
+Version: 1.8.2
 Summary: An implementation of the Debug Adapter Protocol for Python
 Home-page: https://aka.ms/debugpy
 Author: Microsoft Corporation
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Debuggers
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS