debugpy 1.8.5__zip → 1.8.6__zip

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_comm_constants.py

@@ -110,99 +110,91 @@ MAX_IO_MSG_SIZE = 10000
 VERSION_STRING = "@@BUILD_NUMBER@@"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
+
 file_system_encoding = getfilesystemencoding()
-filesystem_encoding_is_utf8 = file_system_encoding.lower() in ('utf-8', 'utf_8', 'utf8')
+filesystem_encoding_is_utf8 = file_system_encoding.lower() in ("utf-8", "utf_8", "utf8")
 
 ID_TO_MEANING = {
-    '101': 'CMD_RUN',
-    '102': 'CMD_LIST_THREADS',
-    '103': 'CMD_THREAD_CREATE',
-    '104': 'CMD_THREAD_KILL',
-    '105': 'CMD_THREAD_SUSPEND',
-    '106': 'CMD_THREAD_RUN',
-    '107': 'CMD_STEP_INTO',
-    '108': 'CMD_STEP_OVER',
-    '109': 'CMD_STEP_RETURN',
-    '110': 'CMD_GET_VARIABLE',
-    '111': 'CMD_SET_BREAK',
-    '112': 'CMD_REMOVE_BREAK',
-    '113': 'CMD_EVALUATE_EXPRESSION',
-    '114': 'CMD_GET_FRAME',
-    '115': 'CMD_EXEC_EXPRESSION',
-    '116': 'CMD_WRITE_TO_CONSOLE',
-    '117': 'CMD_CHANGE_VARIABLE',
-    '118': 'CMD_RUN_TO_LINE',
-    '119': 'CMD_RELOAD_CODE',
-    '120': 'CMD_GET_COMPLETIONS',
-    '121': 'CMD_CONSOLE_EXEC',
-    '122': 'CMD_ADD_EXCEPTION_BREAK',
-    '123': 'CMD_REMOVE_EXCEPTION_BREAK',
-    '124': 'CMD_LOAD_SOURCE',
-    '125': 'CMD_ADD_DJANGO_EXCEPTION_BREAK',
-    '126': 'CMD_REMOVE_DJANGO_EXCEPTION_BREAK',
-    '127': 'CMD_SET_NEXT_STATEMENT',
-    '128': 'CMD_SMART_STEP_INTO',
-    '129': 'CMD_EXIT',
-    '130': 'CMD_SIGNATURE_CALL_TRACE',
-
-    '131': 'CMD_SET_PY_EXCEPTION',
-    '132': 'CMD_GET_FILE_CONTENTS',
-    '133': 'CMD_SET_PROPERTY_TRACE',
-    '134': 'CMD_EVALUATE_CONSOLE_EXPRESSION',
-    '135': 'CMD_RUN_CUSTOM_OPERATION',
-    '136': 'CMD_GET_BREAKPOINT_EXCEPTION',
-    '137': 'CMD_STEP_CAUGHT_EXCEPTION',
-    '138': 'CMD_SEND_CURR_EXCEPTION_TRACE',
-    '139': 'CMD_SEND_CURR_EXCEPTION_TRACE_PROCEEDED',
-    '140': 'CMD_IGNORE_THROWN_EXCEPTION_AT',
-    '141': 'CMD_ENABLE_DONT_TRACE',
-    '142': 'CMD_SHOW_CONSOLE',
-    '143': 'CMD_GET_ARRAY',
-    '144': 'CMD_STEP_INTO_MY_CODE',
-    '145': 'CMD_GET_CONCURRENCY_EVENT',
-    '146': 'CMD_SHOW_RETURN_VALUES',
-    '147': 'CMD_INPUT_REQUESTED',
-    '148': 'CMD_GET_DESCRIPTION',
-
-    '149': 'CMD_PROCESS_CREATED',  # Note: this is actually a notification of a sub-process created.
-    '150': 'CMD_SHOW_CYTHON_WARNING',
-    '151': 'CMD_LOAD_FULL_VALUE',
-    '152': 'CMD_GET_THREAD_STACK',
-    '153': 'CMD_THREAD_DUMP_TO_STDERR',
-    '154': 'CMD_STOP_ON_START',
-    '155': 'CMD_GET_EXCEPTION_DETAILS',
-    '156': 'CMD_PYDEVD_JSON_CONFIG',
-    '157': 'CMD_THREAD_SUSPEND_SINGLE_NOTIFICATION',
-    '158': 'CMD_THREAD_RESUME_SINGLE_NOTIFICATION',
-
-    '159': 'CMD_STEP_OVER_MY_CODE',
-    '160': 'CMD_STEP_RETURN_MY_CODE',
-
-    '161': 'CMD_SET_PY_EXCEPTION_JSON',
-    '162': 'CMD_SET_PATH_MAPPING_JSON',
-    '163': 'CMD_GET_SMART_STEP_INTO_VARIANTS',
-
-    '200': 'CMD_REDIRECT_OUTPUT',
-    '201': 'CMD_GET_NEXT_STATEMENT_TARGETS',
-    '202': 'CMD_SET_PROJECT_ROOTS',
-    '203': 'CMD_MODULE_EVENT',
-    '204': 'CMD_PROCESS_EVENT',  # DAP process event.
-
-    '205': 'CMD_AUTHENTICATE',
-
-    '206': 'CMD_STEP_INTO_COROUTINE',
-
-    '207': 'CMD_LOAD_SOURCE_FROM_FRAME_ID',
-
-    '501': 'CMD_VERSION',
-    '502': 'CMD_RETURN',
-    '503': 'CMD_SET_PROTOCOL',
-    '901': 'CMD_ERROR',
+    "101": "CMD_RUN",
+    "102": "CMD_LIST_THREADS",
+    "103": "CMD_THREAD_CREATE",
+    "104": "CMD_THREAD_KILL",
+    "105": "CMD_THREAD_SUSPEND",
+    "106": "CMD_THREAD_RUN",
+    "107": "CMD_STEP_INTO",
+    "108": "CMD_STEP_OVER",
+    "109": "CMD_STEP_RETURN",
+    "110": "CMD_GET_VARIABLE",
+    "111": "CMD_SET_BREAK",
+    "112": "CMD_REMOVE_BREAK",
+    "113": "CMD_EVALUATE_EXPRESSION",
+    "114": "CMD_GET_FRAME",
+    "115": "CMD_EXEC_EXPRESSION",
+    "116": "CMD_WRITE_TO_CONSOLE",
+    "117": "CMD_CHANGE_VARIABLE",
+    "118": "CMD_RUN_TO_LINE",
+    "119": "CMD_RELOAD_CODE",
+    "120": "CMD_GET_COMPLETIONS",
+    "121": "CMD_CONSOLE_EXEC",
+    "122": "CMD_ADD_EXCEPTION_BREAK",
+    "123": "CMD_REMOVE_EXCEPTION_BREAK",
+    "124": "CMD_LOAD_SOURCE",
+    "125": "CMD_ADD_DJANGO_EXCEPTION_BREAK",
+    "126": "CMD_REMOVE_DJANGO_EXCEPTION_BREAK",
+    "127": "CMD_SET_NEXT_STATEMENT",
+    "128": "CMD_SMART_STEP_INTO",
+    "129": "CMD_EXIT",
+    "130": "CMD_SIGNATURE_CALL_TRACE",
+    "131": "CMD_SET_PY_EXCEPTION",
+    "132": "CMD_GET_FILE_CONTENTS",
+    "133": "CMD_SET_PROPERTY_TRACE",
+    "134": "CMD_EVALUATE_CONSOLE_EXPRESSION",
+    "135": "CMD_RUN_CUSTOM_OPERATION",
+    "136": "CMD_GET_BREAKPOINT_EXCEPTION",
+    "137": "CMD_STEP_CAUGHT_EXCEPTION",
+    "138": "CMD_SEND_CURR_EXCEPTION_TRACE",
+    "139": "CMD_SEND_CURR_EXCEPTION_TRACE_PROCEEDED",
+    "140": "CMD_IGNORE_THROWN_EXCEPTION_AT",
+    "141": "CMD_ENABLE_DONT_TRACE",
+    "142": "CMD_SHOW_CONSOLE",
+    "143": "CMD_GET_ARRAY",
+    "144": "CMD_STEP_INTO_MY_CODE",
+    "145": "CMD_GET_CONCURRENCY_EVENT",
+    "146": "CMD_SHOW_RETURN_VALUES",
+    "147": "CMD_INPUT_REQUESTED",
+    "148": "CMD_GET_DESCRIPTION",
+    "149": "CMD_PROCESS_CREATED",  # Note: this is actually a notification of a sub-process created.
+    "150": "CMD_SHOW_CYTHON_WARNING",
+    "151": "CMD_LOAD_FULL_VALUE",
+    "152": "CMD_GET_THREAD_STACK",
+    "153": "CMD_THREAD_DUMP_TO_STDERR",
+    "154": "CMD_STOP_ON_START",
+    "155": "CMD_GET_EXCEPTION_DETAILS",
+    "156": "CMD_PYDEVD_JSON_CONFIG",
+    "157": "CMD_THREAD_SUSPEND_SINGLE_NOTIFICATION",
+    "158": "CMD_THREAD_RESUME_SINGLE_NOTIFICATION",
+    "159": "CMD_STEP_OVER_MY_CODE",
+    "160": "CMD_STEP_RETURN_MY_CODE",
+    "161": "CMD_SET_PY_EXCEPTION_JSON",
+    "162": "CMD_SET_PATH_MAPPING_JSON",
+    "163": "CMD_GET_SMART_STEP_INTO_VARIANTS",
+    "200": "CMD_REDIRECT_OUTPUT",
+    "201": "CMD_GET_NEXT_STATEMENT_TARGETS",
+    "202": "CMD_SET_PROJECT_ROOTS",
+    "203": "CMD_MODULE_EVENT",
+    "204": "CMD_PROCESS_EVENT",  # DAP process event.
+    "205": "CMD_AUTHENTICATE",
+    "206": "CMD_STEP_INTO_COROUTINE",
+    "207": "CMD_LOAD_SOURCE_FROM_FRAME_ID",
+    "501": "CMD_VERSION",
+    "502": "CMD_RETURN",
+    "503": "CMD_SET_PROTOCOL",
+    "901": "CMD_ERROR",
 }
 
 
 def constant_to_str(constant):
     s = ID_TO_MEANING.get(str(constant))
     if not s:
-        s = '<Unknown: %s>' % (constant,)
+        s = "<Unknown: %s>" % (constant,)
     return s

{debugpy-1.8.5 → debugpy-1.8.6}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_command_line_handling.py

@@ -3,13 +3,13 @@ import sys
 
 
 class ArgHandlerWithParam:
-    '''
+    """
     Handler for some arguments which needs a value
-    '''
+    """
 
     def __init__(self, arg_name, convert_val=None, default_val=None):
         self.arg_name = arg_name
-        self.arg_v_rep = '--%s' % (arg_name,)
+        self.arg_v_rep = "--%s" % (arg_name,)
         self.convert_val = convert_val
         self.default_val = default_val
 
@@ -17,7 +17,7 @@ class ArgHandlerWithParam:
         v = setup.get(self.arg_name)
         if v is not None and v != self.default_val:
             lst.append(self.arg_v_rep)
-            lst.append('%s' % (v,))
+            lst.append("%s" % (v,))
 
     def handle_argv(self, argv, i, setup):
         assert argv[i] == self.arg_v_rep
@@ -32,13 +32,13 @@ class ArgHandlerWithParam:
 
 
 class ArgHandlerBool:
-    '''
+    """
     If a given flag is received, mark it as 'True' in setup.
-    '''
+    """
 
     def __init__(self, arg_name, default_val=False):
         self.arg_name = arg_name
-        self.arg_v_rep = '--%s' % (arg_name,)
+        self.arg_v_rep = "--%s" % (arg_name,)
         self.default_val = default_val
 
     def to_argv(self, lst, setup):
@@ -56,42 +56,38 @@ def convert_ppid(ppid):
     ret = int(ppid)
     if ret != 0:
         if ret == os.getpid():
-            raise AssertionError(
-                'ppid passed is the same as the current process pid (%s)!' % (ret,))
+            raise AssertionError("ppid passed is the same as the current process pid (%s)!" % (ret,))
     return ret
 
 
 ACCEPTED_ARG_HANDLERS = [
-    ArgHandlerWithParam('port', int, 0),
-    ArgHandlerWithParam('ppid', convert_ppid, 0),
-    ArgHandlerWithParam('vm_type'),
-    ArgHandlerWithParam('client'),
-    ArgHandlerWithParam('access-token'),
-    ArgHandlerWithParam('client-access-token'),
-    ArgHandlerWithParam('debug-mode'),
-    ArgHandlerWithParam('preimport'),
-
+    ArgHandlerWithParam("port", int, 0),
+    ArgHandlerWithParam("ppid", convert_ppid, 0),
+    ArgHandlerWithParam("vm_type"),
+    ArgHandlerWithParam("client"),
+    ArgHandlerWithParam("access-token"),
+    ArgHandlerWithParam("client-access-token"),
+    ArgHandlerWithParam("debug-mode"),
+    ArgHandlerWithParam("preimport"),
     # Logging
-    ArgHandlerWithParam('log-file'),
-    ArgHandlerWithParam('log-level', int, None),
-
-    ArgHandlerBool('server'),
-    ArgHandlerBool('multiproc'),  # Used by PyCharm (reuses connection: ssh tunneling)
-    ArgHandlerBool('multiprocess'),  # Used by PyDev (creates new connection to ide)
-    ArgHandlerBool('save-signatures'),
-    ArgHandlerBool('save-threading'),
-    ArgHandlerBool('save-asyncio'),
-    ArgHandlerBool('print-in-debugger-startup'),
-    ArgHandlerBool('cmd-line'),
-    ArgHandlerBool('module'),
-    ArgHandlerBool('skip-notify-stdin'),
-
+    ArgHandlerWithParam("log-file"),
+    ArgHandlerWithParam("log-level", int, None),
+    ArgHandlerBool("server"),
+    ArgHandlerBool("multiproc"),  # Used by PyCharm (reuses connection: ssh tunneling)
+    ArgHandlerBool("multiprocess"),  # Used by PyDev (creates new connection to ide)
+    ArgHandlerBool("save-signatures"),
+    ArgHandlerBool("save-threading"),
+    ArgHandlerBool("save-asyncio"),
+    ArgHandlerBool("print-in-debugger-startup"),
+    ArgHandlerBool("cmd-line"),
+    ArgHandlerBool("module"),
+    ArgHandlerBool("skip-notify-stdin"),
     # The ones below should've been just one setting to specify the protocol, but for compatibility
     # reasons they're passed as a flag but are mutually exclusive.
-    ArgHandlerBool('json-dap'),  # Protocol used by ptvsd to communicate with pydevd (a single json message in each read)
-    ArgHandlerBool('json-dap-http'),  # Actual DAP (json messages over http protocol).
-    ArgHandlerBool('protocol-quoted-line'),  # Custom protocol with quoted lines.
-    ArgHandlerBool('protocol-http'),  # Custom protocol with http.
+    ArgHandlerBool("json-dap"),  # Protocol used by ptvsd to communicate with pydevd (a single json message in each read)
+    ArgHandlerBool("json-dap-http"),  # Actual DAP (json messages over http protocol).
+    ArgHandlerBool("protocol-quoted-line"),  # Custom protocol with quoted lines.
+    ArgHandlerBool("protocol-http"),  # Custom protocol with http.
 ]
 
 ARGV_REP_TO_HANDLER = {}
@@ -101,16 +97,17 @@ for handler in ACCEPTED_ARG_HANDLERS:
 
 def get_pydevd_file():
     import pydevd
+
     f = pydevd.__file__
-    if f.endswith('.pyc'):
+    if f.endswith(".pyc"):
         f = f[:-1]
-    elif f.endswith('$py.class'):
-        f = f[:-len('$py.class')] + '.py'
+    elif f.endswith("$py.class"):
+        f = f[: -len("$py.class")] + ".py"
     return f
 
 
 def setup_to_argv(setup, skip_names=None):
-    '''
+    """
     :param dict setup:
         A dict previously gotten from process_command_line.
 
@@ -118,7 +115,7 @@ def setup_to_argv(setup, skip_names=None):
         The names in the setup which shouldn't be converted to argv.
 
     :note: does not handle --file nor --DEBUG.
-    '''
+    """
     if skip_names is None:
         skip_names = set()
     ret = [get_pydevd_file()]
@@ -130,13 +127,13 @@ def setup_to_argv(setup, skip_names=None):
 
 
 def process_command_line(argv):
-    """ parses the arguments.
-        removes our arguments from the command line """
+    """parses the arguments.
+    removes our arguments from the command line"""
     setup = {}
     for handler in ACCEPTED_ARG_HANDLERS:
         setup[handler.arg_name] = handler.default_val
-    setup['file'] = ''
-    setup['qt-support'] = ''
+    setup["file"] = ""
+    setup["qt-support"] = ""
 
     initial_argv = tuple(argv)
 
@@ -147,39 +144,38 @@ def process_command_line(argv):
         if handler is not None:
             handler.handle_argv(argv, i, setup)
 
-        elif argv[i].startswith('--qt-support'):
+        elif argv[i].startswith("--qt-support"):
             # The --qt-support is special because we want to keep backward compatibility:
             # Previously, just passing '--qt-support' meant that we should use the auto-discovery mode
             # whereas now, if --qt-support is passed, it should be passed as --qt-support=<mode>, where
             # mode can be one of 'auto', 'none', 'pyqt5', 'pyqt4', 'pyside', 'pyside2'.
-            if argv[i] == '--qt-support':
-                setup['qt-support'] = 'auto'
+            if argv[i] == "--qt-support":
+                setup["qt-support"] = "auto"
 
-            elif argv[i].startswith('--qt-support='):
-                qt_support = argv[i][len('--qt-support='):]
-                valid_modes = ('none', 'auto', 'pyqt5', 'pyqt4', 'pyside', 'pyside2')
+            elif argv[i].startswith("--qt-support="):
+                qt_support = argv[i][len("--qt-support=") :]
+                valid_modes = ("none", "auto", "pyqt5", "pyqt4", "pyside", "pyside2")
                 if qt_support not in valid_modes:
                     raise ValueError("qt-support mode invalid: " + qt_support)
-                if qt_support == 'none':
+                if qt_support == "none":
                     # On none, actually set an empty string to evaluate to False.
-                    setup['qt-support'] = ''
+                    setup["qt-support"] = ""
                 else:
-                    setup['qt-support'] = qt_support
+                    setup["qt-support"] = qt_support
             else:
                 raise ValueError("Unexpected definition for qt-support flag: " + argv[i])
 
             del argv[i]
 
-        elif argv[i] == '--file':
+        elif argv[i] == "--file":
             # --file is special because it's the last one (so, no handler for it).
             del argv[i]
-            setup['file'] = argv[i]
+            setup["file"] = argv[i]
             i = len(argv)  # pop out, file is our last argument
 
-        elif argv[i] == '--DEBUG':
-            sys.stderr.write('pydevd: --DEBUG parameter deprecated. Use `--debug-level=3` instead.\n')
+        elif argv[i] == "--DEBUG":
+            sys.stderr.write("pydevd: --DEBUG parameter deprecated. Use `--debug-level=3` instead.\n")
 
         else:
             raise ValueError("Unexpected option: %s when processing: %s" % (argv[i], initial_argv))
     return setup
-