debugpy 1.8.5__zip → 1.8.7__zip

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

@@ -1,7 +1,5 @@
-
-
 def get_main_thread_instance(threading):
-    if hasattr(threading, 'main_thread'):
+    if hasattr(threading, "main_thread"):
         return threading.main_thread()
     else:
         # On Python 2 we don't really have an API to get the main thread,
@@ -10,12 +8,12 @@ def get_main_thread_instance(threading):
 
 
 def get_main_thread_id(unlikely_thread_id=None):
-    '''
+    """
     :param unlikely_thread_id:
         Pass to mark some thread id as not likely the main thread.
 
     :return tuple(thread_id, critical_warning)
-    '''
+    """
     import sys
     import os
 
@@ -26,22 +24,22 @@ def get_main_thread_id(unlikely_thread_id=None):
             frame = frame.f_back
 
         basename = os.path.basename(frame.f_code.co_filename)
-        if basename.endswith(('.pyc', '.pyo')):
+        if basename.endswith((".pyc", ".pyo")):
             basename = basename[:-1]
 
         if (frame.f_code.co_name, basename) in [
-                ('_run_module_as_main', 'runpy.py'),
-                ('_run_module_as_main', '<frozen runpy>'),
-                ('run_module_as_main', 'runpy.py'),
-                ('run_module', 'runpy.py'),
-                ('run_path', 'runpy.py'),
-            ]:
+            ("_run_module_as_main", "runpy.py"),
+            ("_run_module_as_main", "<frozen runpy>"),
+            ("run_module_as_main", "runpy.py"),
+            ("run_module", "runpy.py"),
+            ("run_path", "runpy.py"),
+        ]:
             # This is the case for python -m <module name> (this is an ideal match, so,
             # let's return it).
-            return thread_ident, ''
+            return thread_ident, ""
 
-        if frame.f_code.co_name == '<module>':
-            if frame.f_globals.get('__name__') == '__main__':
+        if frame.f_code.co_name == "<module>":
+            if frame.f_globals.get("__name__") == "__main__":
                 possible_thread_ids.insert(0, thread_ident)  # Add with higher priority
                 continue
 
@@ -53,25 +51,26 @@ def get_main_thread_id(unlikely_thread_id=None):
 
     if len(possible_thread_ids) > 0:
         if len(possible_thread_ids) == 1:
-            return possible_thread_ids[0], ''  # Ideal: only one match
+            return possible_thread_ids[0], ""  # Ideal: only one match
 
         while unlikely_thread_id in possible_thread_ids:
             possible_thread_ids.remove(unlikely_thread_id)
 
         if len(possible_thread_ids) == 1:
-            return possible_thread_ids[0], ''  # Ideal: only one match
+            return possible_thread_ids[0], ""  # Ideal: only one match
 
         elif len(possible_thread_ids) > 1:
             # Bad: we can't really be certain of anything at this point.
-            return possible_thread_ids[0], \
-                'Multiple thread ids found (%s). Choosing main thread id randomly (%s).' % (
-                    possible_thread_ids, possible_thread_ids[0])
+            return possible_thread_ids[0], "Multiple thread ids found (%s). Choosing main thread id randomly (%s)." % (
+                possible_thread_ids,
+                possible_thread_ids[0],
+            )
 
     # If we got here we couldn't discover the main thread id.
-    return None, 'Unable to discover main thread id.'
+    return None, "Unable to discover main thread id."
 
 
-def fix_main_thread_id(on_warn=lambda msg:None, on_exception=lambda msg:None, on_critical=lambda msg:None):
+def fix_main_thread_id(on_warn=lambda msg: None, on_exception=lambda msg: None, on_critical=lambda msg: None):
     # This means that we weren't able to import threading in the main thread (which most
     # likely means that the main thread is paused or in some very long operation).
     # In this case we'll import threading here and hotfix what may be wrong in the threading
@@ -86,10 +85,10 @@ def fix_main_thread_id(on_warn=lambda msg:None, on_exception=lambda msg:None, on
         with threading._active_limbo_lock:
             main_thread_instance = get_main_thread_instance(threading)
 
-            if sys.platform == 'win32':
+            if sys.platform == "win32":
                 # On windows this code would be called in a secondary thread, so,
                 # the current thread is unlikely to be the main thread.
-                if hasattr(threading, '_get_ident'):
+                if hasattr(threading, "_get_ident"):
                     unlikely_thread_id = threading._get_ident()  # py2
                 else:
                     unlikely_thread_id = threading.get_ident()  # py3
@@ -99,9 +98,9 @@ def fix_main_thread_id(on_warn=lambda msg:None, on_exception=lambda msg:None, on
             main_thread_id, critical_warning = get_main_thread_id(unlikely_thread_id)
 
             if main_thread_id is not None:
-                main_thread_id_attr = '_ident'
+                main_thread_id_attr = "_ident"
                 if not hasattr(main_thread_instance, main_thread_id_attr):
-                    main_thread_id_attr = '_Thread__ident'
+                    main_thread_id_attr = "_Thread__ident"
                     assert hasattr(main_thread_instance, main_thread_id_attr)
 
                 if main_thread_id != getattr(main_thread_instance, main_thread_id_attr):
@@ -121,45 +120,54 @@ def fix_main_thread_id(on_warn=lambda msg:None, on_exception=lambda msg:None, on
 
         # Note: only import from pydevd after the patching is done (we want to do the minimum
         # possible when doing that patching).
-        on_warn('The threading module was not imported by user code in the main thread. The debugger will attempt to work around https://bugs.python.org/issue37416.')
+        on_warn(
+            "The threading module was not imported by user code in the main thread. The debugger will attempt to work around https://bugs.python.org/issue37416."
+        )
 
         if critical_warning:
-            on_critical('Issue found when debugger was trying to work around https://bugs.python.org/issue37416:\n%s' % (critical_warning,))
+            on_critical("Issue found when debugger was trying to work around https://bugs.python.org/issue37416:\n%s" % (critical_warning,))
     except:
-        on_exception('Error patching main thread id.')
+        on_exception("Error patching main thread id.")
 
 
-def attach(port, host, protocol='', debug_mode=''):
+def attach(port, host, protocol="", debug_mode=""):
     try:
         import sys
-        fix_main_thread = 'threading' not in sys.modules
+
+        fix_main_thread = "threading" not in sys.modules
 
         if fix_main_thread:
 
             def on_warn(msg):
                 from _pydev_bundle import pydev_log
+
                 pydev_log.warn(msg)
 
             def on_exception(msg):
                 from _pydev_bundle import pydev_log
+
                 pydev_log.exception(msg)
 
             def on_critical(msg):
                 from _pydev_bundle import pydev_log
+
                 pydev_log.critical(msg)
 
             fix_main_thread_id(on_warn=on_warn, on_exception=on_exception, on_critical=on_critical)
 
         else:
             from _pydev_bundle import pydev_log  # @Reimport
-            pydev_log.debug('The threading module is already imported by user code.')
+
+            pydev_log.debug("The threading module is already imported by user code.")
 
         if protocol:
             from _pydevd_bundle import pydevd_defaults
+
             pydevd_defaults.PydevdCustomization.DEFAULT_PROTOCOL = protocol
 
         if debug_mode:
             from _pydevd_bundle import pydevd_defaults
+
             pydevd_defaults.PydevdCustomization.DEBUG_MODE = debug_mode
 
         import pydevd
@@ -185,4 +193,5 @@ def attach(port, host, protocol='', debug_mode=''):
         )
     except:
         import traceback
+
         traceback.print_exc()

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/common/py_utils.hpp

@@ -11,6 +11,7 @@ typedef PyThreadState* (PyInterpreterState_ThreadHead)(PyInterpreterState* inter
 typedef PyThreadState* (PyThreadState_Next)(PyThreadState *tstate);
 typedef PyThreadState* (PyThreadState_Swap)(PyThreadState *tstate);
 typedef PyThreadState* (_PyThreadState_UncheckedGet)();
+typedef PyThreadState* (_PyThreadState_GetCurrent)();
 typedef PyObject* (PyObject_CallFunctionObjArgs)(PyObject *callable, ...);    // call w/ varargs, last arg should be nullptr
 typedef PyObject* (PyInt_FromLong)(long);
 typedef PyObject* (PyErr_Occurred)();

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/common/py_version.hpp

@@ -21,7 +21,9 @@ enum PythonVersion {
     PythonVersion_38 = 0x0308,
     PythonVersion_39 = 0x0309,
     PythonVersion_310 = 0x030A,
-    PythonVersion_311 = 0x030B
+    PythonVersion_311 = 0x030B,
+    PythonVersion_312 = 0x030C,
+    PythonVersion_313 = 0x030D,
 };
 
 
@@ -70,6 +72,12 @@ static PythonVersion GetPythonVersion(void *module) {
                     if(version[3] == '1'){
                         return PythonVersion_311;
                     }
+                    if(version[3] == '2'){
+                        return PythonVersion_312;
+                    }
+                    if(version[3] == '3'){
+                        return PythonVersion_313;
+                    }
                 }
                 return PythonVersion_Unknown; // we don't care about 3.1 anymore...
             

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/lldb_prepare.py

@@ -3,8 +3,10 @@
 # Also it marks process threads to to distinguish them from debugger
 # threads later while settings trace in threads
 
+
 def load_lib_and_attach(debugger, command, result, internal_dict):
     import shlex
+
     args = shlex.split(command)
 
     dll = args[0]
@@ -13,6 +15,7 @@ def load_lib_and_attach(debugger, command, result, internal_dict):
     show_debug_info = args[3]
 
     import lldb
+
     options = lldb.SBExpressionOptions()
     options.SetFetchDynamicValue()
     options.SetTryAllThreads(run_others=False)
@@ -20,23 +23,22 @@ def load_lib_and_attach(debugger, command, result, internal_dict):
 
     print(dll)
     target = debugger.GetSelectedTarget()
-    res = target.EvaluateExpression("(void*)dlopen(\"%s\", 2);" % (
-        dll), options)
+    res = target.EvaluateExpression('(void*)dlopen("%s", 2);' % (dll), options)
     error = res.GetError()
     if error:
         print(error)
 
     print(python_code)
-    res = target.EvaluateExpression("(int)DoAttach(%s, \"%s\", %s);" % (
-        is_debug, python_code.replace('"', "'"), show_debug_info), options)
+    res = target.EvaluateExpression('(int)DoAttach(%s, "%s", %s);' % (is_debug, python_code.replace('"', "'"), show_debug_info), options)
     error = res.GetError()
     if error:
         print(error)
 
+
 def __lldb_init_module(debugger, internal_dict):
     import lldb
 
-    debugger.HandleCommand('command script add -f lldb_prepare.load_lib_and_attach load_lib_and_attach')
+    debugger.HandleCommand("command script add -f lldb_prepare.load_lib_and_attach load_lib_and_attach")
 
     try:
         target = debugger.GetSelectedTarget()
@@ -45,10 +47,9 @@ def __lldb_init_module(debugger, internal_dict):
             if process:
                 for thread in process:
                     # print('Marking process thread %d'%thread.GetThreadID())
-                    internal_dict['_thread_%d' % thread.GetThreadID()] = True
+                    internal_dict["_thread_%d" % thread.GetThreadID()] = True
                     # thread.Suspend()
     except:
-        import traceback;traceback.print_exc()
-
-
+        import traceback
 
+        traceback.print_exc()

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/winappdbg/__init__.py

@@ -113,122 +113,105 @@ Blog:    U{http://breakingcode.wordpress.com}
 __revision__ = "$Id$"
 
 # List of all public symbols
-__all__ =   [
-                # Library version
-                'version',
-                'version_number',
-
-                # from breakpoint import *
-##                'Breakpoint',
-##                'CodeBreakpoint',
-##                'PageBreakpoint',
-##                'HardwareBreakpoint',
-##                'Hook',
-##                'ApiHook',
-##                'BufferWatch',
-                'BreakpointWarning',
-                'BreakpointCallbackWarning',
-
-                # from crash import *
-                'Crash',
-                'CrashWarning',
-                'CrashDictionary',
-                'CrashContainer',
-                'CrashTable',
-                'CrashTableMSSQL',
-                'VolatileCrashContainer',
-                'DummyCrashContainer',
-
-                # from debug import *
-                'Debug',
-                'MixedBitsWarning',
-
-                # from disasm import *
-                'Disassembler',
-                'BeaEngine',
-                'DistormEngine',
-                'PyDasmEngine',
-
-                # from event import *
-                'EventHandler',
-                'EventSift',
-##                'EventFactory',
-##                'EventDispatcher',
-                'EventCallbackWarning',
-                'Event',
-##                'NoEvent',
-                'CreateProcessEvent',
-                'CreateThreadEvent',
-                'ExitProcessEvent',
-                'ExitThreadEvent',
-                'LoadDLLEvent',
-                'UnloadDLLEvent',
-                'OutputDebugStringEvent',
-                'RIPEvent',
-                'ExceptionEvent',
-
-                # from interactive import *
-##                'ConsoleDebugger',
-
-                # from module import *
-                'Module',
-                'DebugSymbolsWarning',
-
-                # from process import *
-                'Process',
-
-                # from system import *
-                'System',
-
-                # from search import *
-                'Search',
-                'Pattern',
-                'BytePattern',
-                'TextPattern',
-                'RegExpPattern',
-                'HexPattern',
-
-                # from registry import *
-                'Registry',
-
-                # from textio import *
-                'HexDump',
-                'HexInput',
-                'HexOutput',
-                'Color',
-                'Table',
-                'CrashDump',
-                'DebugLog',
-                'Logger',
-
-                # from thread import *
-                'Thread',
-
-                # from util import *
-                'PathOperations',
-                'MemoryAddresses',
-                'CustomAddressIterator',
-                'DataAddressIterator',
-                'ImageAddressIterator',
-                'MappedAddressIterator',
-                'ExecutableAddressIterator',
-                'ReadableAddressIterator',
-                'WriteableAddressIterator',
-                'ExecutableAndWriteableAddressIterator',
-                'DebugRegister',
-
-                # from window import *
-                'Window',
-
-                # import win32
-                'win32',
-
-                # from win32 import Handle, ProcessHandle, ThreadHandle, FileHandle
-                'Handle',
-                'ProcessHandle',
-                'ThreadHandle',
-                'FileHandle',
-            ]
+__all__ = [
+    # Library version
+    "version",
+    "version_number",
+    # from breakpoint import *
+    ##                'Breakpoint',
+    ##                'CodeBreakpoint',
+    ##                'PageBreakpoint',
+    ##                'HardwareBreakpoint',
+    ##                'Hook',
+    ##                'ApiHook',
+    ##                'BufferWatch',
+    "BreakpointWarning",
+    "BreakpointCallbackWarning",
+    # from crash import *
+    "Crash",
+    "CrashWarning",
+    "CrashDictionary",
+    "CrashContainer",
+    "CrashTable",
+    "CrashTableMSSQL",
+    "VolatileCrashContainer",
+    "DummyCrashContainer",
+    # from debug import *
+    "Debug",
+    "MixedBitsWarning",
+    # from disasm import *
+    "Disassembler",
+    "BeaEngine",
+    "DistormEngine",
+    "PyDasmEngine",
+    # from event import *
+    "EventHandler",
+    "EventSift",
+    ##                'EventFactory',
+    ##                'EventDispatcher',
+    "EventCallbackWarning",
+    "Event",
+    ##                'NoEvent',
+    "CreateProcessEvent",
+    "CreateThreadEvent",
+    "ExitProcessEvent",
+    "ExitThreadEvent",
+    "LoadDLLEvent",
+    "UnloadDLLEvent",
+    "OutputDebugStringEvent",
+    "RIPEvent",
+    "ExceptionEvent",
+    # from interactive import *
+    ##                'ConsoleDebugger',
+    # from module import *
+    "Module",
+    "DebugSymbolsWarning",
+    # from process import *
+    "Process",
+    # from system import *
+    "System",
+    # from search import *
+    "Search",
+    "Pattern",
+    "BytePattern",
+    "TextPattern",
+    "RegExpPattern",
+    "HexPattern",
+    # from registry import *
+    "Registry",
+    # from textio import *
+    "HexDump",
+    "HexInput",
+    "HexOutput",
+    "Color",
+    "Table",
+    "CrashDump",
+    "DebugLog",
+    "Logger",
+    # from thread import *
+    "Thread",
+    # from util import *
+    "PathOperations",
+    "MemoryAddresses",
+    "CustomAddressIterator",
+    "DataAddressIterator",
+    "ImageAddressIterator",
+    "MappedAddressIterator",
+    "ExecutableAddressIterator",
+    "ReadableAddressIterator",
+    "WriteableAddressIterator",
+    "ExecutableAndWriteableAddressIterator",
+    "DebugRegister",
+    # from window import *
+    "Window",
+    # import win32
+    "win32",
+    # from win32 import Handle, ProcessHandle, ThreadHandle, FileHandle
+    "Handle",
+    "ProcessHandle",
+    "ThreadHandle",
+    "FileHandle",
+]
 
 # Import all public symbols
 from winappdbg.breakpoint import *
@@ -252,11 +235,12 @@ from winappdbg.win32 import Handle, ProcessHandle, ThreadHandle, FileHandle
 
 try:
     from sql import *
-    __all__.append('CrashDAO')
+
+    __all__.append("CrashDAO")
 except ImportError:
     import warnings
-    warnings.warn("No SQL database support present (missing dependencies?)",
-                  ImportWarning)
+
+    warnings.warn("No SQL database support present (missing dependencies?)", ImportWarning)
 
 # Library version
 version_number = 1.5