debugpy 1.8.5__zip → 1.8.7__zip

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_signature.py

@@ -14,7 +14,6 @@ from _pydevd_bundle.pydevd_utils import get_clsname_for_code
 
 
 class Signature(object):
-
     def __init__(self, file, name):
         self.file = file
         self.name = name
@@ -42,37 +41,36 @@ class Signature(object):
         return "%s %s(%s)" % (self.file, self.name, ", ".join(self.args_str))
 
 
-def get_type_of_value(value, ignore_module_name=('__main__', '__builtin__', 'builtins'), recursive=False):
+def get_type_of_value(value, ignore_module_name=("__main__", "__builtin__", "builtins"), recursive=False):
     tp = type(value)
     class_name = tp.__name__
-    if class_name == 'instance':  # old-style classes
+    if class_name == "instance":  # old-style classes
         tp = value.__class__
         class_name = tp.__name__
 
-    if hasattr(tp, '__module__') and tp.__module__ and tp.__module__ not in ignore_module_name:
+    if hasattr(tp, "__module__") and tp.__module__ and tp.__module__ not in ignore_module_name:
         class_name = "%s.%s" % (tp.__module__, class_name)
 
-    if class_name == 'list':
-        class_name = 'List'
+    if class_name == "list":
+        class_name = "List"
         if len(value) > 0 and recursive:
-            class_name += '[%s]' % get_type_of_value(value[0], recursive=recursive)
+            class_name += "[%s]" % get_type_of_value(value[0], recursive=recursive)
         return class_name
 
-    if class_name == 'dict':
-        class_name = 'Dict'
+    if class_name == "dict":
+        class_name = "Dict"
         if len(value) > 0 and recursive:
-            for (k, v) in value.items():
-                class_name += '[%s, %s]' % (get_type_of_value(k, recursive=recursive),
-                                            get_type_of_value(v, recursive=recursive))
+            for k, v in value.items():
+                class_name += "[%s, %s]" % (get_type_of_value(k, recursive=recursive), get_type_of_value(v, recursive=recursive))
                 break
         return class_name
 
-    if class_name == 'tuple':
-        class_name = 'Tuple'
+    if class_name == "tuple":
+        class_name = "Tuple"
         if len(value) > 0 and recursive:
-            class_name += '['
-            class_name += ', '.join(get_type_of_value(v, recursive=recursive) for v in value)
-            class_name += ']'
+            class_name += "["
+            class_name += ", ".join(get_type_of_value(v, recursive=recursive) for v in value)
+            class_name += "]"
 
     return class_name
 
@@ -85,7 +83,6 @@ def _modname(path):
 
 
 class SignatureFactory(object):
-
     def __init__(self):
         self._caller_cache = {}
         self.cache = CallSignatureCache()
@@ -130,7 +127,7 @@ class SignatureFactory(object):
 
 
 def get_signature_info(signature):
-    return signature.file, signature.name, ' '.join([arg[1] for arg in signature.args])
+    return signature.file, signature.name, " ".join([arg[1] for arg in signature.args])
 
 
 def get_frame_info(frame):
@@ -139,7 +136,6 @@ def get_frame_info(frame):
 
 
 class CallSignatureCache(object):
-
     def __init__(self):
         self.cache = {}
 
@@ -159,16 +155,21 @@ class CallSignatureCache(object):
 def create_signature_message(signature):
     cmdTextList = ["<xml>"]
 
-    cmdTextList.append('<call_signature file="%s" name="%s">' % (pydevd_xml.make_valid_xml_value(signature.file), pydevd_xml.make_valid_xml_value(signature.name)))
+    cmdTextList.append(
+        '<call_signature file="%s" name="%s">'
+        % (pydevd_xml.make_valid_xml_value(signature.file), pydevd_xml.make_valid_xml_value(signature.name))
+    )
 
     for arg in signature.args:
-        cmdTextList.append('<arg name="%s" type="%s"></arg>' % (pydevd_xml.make_valid_xml_value(arg[0]), pydevd_xml.make_valid_xml_value(arg[1])))
+        cmdTextList.append(
+            '<arg name="%s" type="%s"></arg>' % (pydevd_xml.make_valid_xml_value(arg[0]), pydevd_xml.make_valid_xml_value(arg[1]))
+        )
 
     if signature.return_type is not None:
         cmdTextList.append('<return type="%s"></return>' % (pydevd_xml.make_valid_xml_value(signature.return_type)))
 
     cmdTextList.append("</call_signature></xml>")
-    cmdText = ''.join(cmdTextList)
+    cmdText = "".join(cmdTextList)
     return NetCommand(CMD_SIGNATURE_CALL_TRACE, 0, cmdText)
 
 
@@ -198,4 +199,3 @@ def send_signature_return_trace(dbg, frame, filename, return_value):
         return True
 
     return False
-

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_source_mapping.py

@@ -4,8 +4,7 @@ import pydevd_file_utils
 
 
 class SourceMappingEntry(object):
-
-    __slots__ = ['source_filename', 'line', 'end_line', 'runtime_line', 'runtime_source']
+    __slots__ = ["source_filename", "line", "end_line", "runtime_line", "runtime_source"]
 
     def __init__(self, line, end_line, runtime_line, runtime_source):
         assert isinstance(runtime_source, str)
@@ -28,14 +27,12 @@ class SourceMappingEntry(object):
         return self.runtime_line <= i <= runtime_end_line
 
     def __str__(self):
-        return 'SourceMappingEntry(%s)' % (
-            ', '.join('%s=%r' % (attr, getattr(self, attr)) for attr in self.__slots__))
+        return "SourceMappingEntry(%s)" % (", ".join("%s=%r" % (attr, getattr(self, attr)) for attr in self.__slots__))
 
     __repr__ = __str__
 
 
 class SourceMapping(object):
-
     def __init__(self, on_source_mapping_changed=NULL):
         self._mappings_to_server = {}  # dict(normalized(file.py) to [SourceMappingEntry])
         self._mappings_to_client = {}  # dict(<cell> to File.py)
@@ -43,7 +40,7 @@ class SourceMapping(object):
         self._on_source_mapping_changed = on_source_mapping_changed
 
     def set_source_mapping(self, absolute_filename, mapping):
-        '''
+        """
         :param str absolute_filename:
             The filename for the source mapping (bytes on py2 and str on py3).
 
@@ -53,7 +50,7 @@ class SourceMapping(object):
         :return str:
             An error message if it was not possible to set the mapping or an empty string if
             everything is ok.
-        '''
+        """
         # Let's first validate if it's ok to apply that mapping.
         # File mappings must be 1:N, not M:N (i.e.: if there's a mapping from file1.py to <cell1>,
         # there can be no other mapping from any other file to <cell1>).
@@ -63,8 +60,12 @@ class SourceMapping(object):
         for map_entry in mapping:
             existing_source_filename = self._mappings_to_client.get(map_entry.runtime_source)
             if existing_source_filename and existing_source_filename != absolute_filename:
-                return 'Cannot apply mapping from %s to %s (it conflicts with mapping: %s to %s)' % (
-                    absolute_filename, map_entry.runtime_source, existing_source_filename, map_entry.runtime_source)
+                return "Cannot apply mapping from %s to %s (it conflicts with mapping: %s to %s)" % (
+                    absolute_filename,
+                    map_entry.runtime_source,
+                    existing_source_filename,
+                    map_entry.runtime_source,
+                )
 
         try:
             absolute_normalized_filename = pydevd_file_utils.normcase(absolute_filename)
@@ -72,17 +73,17 @@ class SourceMapping(object):
             for map_entry in current_mapping:
                 del self._mappings_to_client[map_entry.runtime_source]
 
-            self._mappings_to_server[absolute_normalized_filename] = sorted(mapping, key=lambda entry:entry.line)
+            self._mappings_to_server[absolute_normalized_filename] = sorted(mapping, key=lambda entry: entry.line)
 
             for map_entry in mapping:
                 self._mappings_to_client[map_entry.runtime_source] = absolute_filename
         finally:
             self._cache.clear()
             self._on_source_mapping_changed()
-        return ''
+        return ""
 
     def map_to_client(self, runtime_source_filename, lineno):
-        key = (lineno, 'client', runtime_source_filename)
+        key = (lineno, "client", runtime_source_filename)
         try:
             return self._cache[key]
         except KeyError:
@@ -97,13 +98,13 @@ class SourceMapping(object):
             return self._cache[key]
 
     def has_mapping_entry(self, runtime_source_filename):
-        '''
+        """
         :param runtime_source_filename:
             Something as <ipython-cell-xxx>
-        '''
+        """
         # Note that we're not interested in the line here, just on knowing if a given filename
         # (from the server) has a mapping for it.
-        key = ('has_entry', runtime_source_filename)
+        key = ("has_entry", runtime_source_filename)
         try:
             return self._cache[key]
         except KeyError:
@@ -117,18 +118,17 @@ class SourceMapping(object):
             return self._cache[key]
 
     def map_to_server(self, absolute_filename, lineno):
-        '''
+        """
         Convert something as 'file1.py' at line 10 to '<ipython-cell-xxx>' at line 2.
 
         Note that the name should be already normalized at this point.
-        '''
+        """
         absolute_normalized_filename = pydevd_file_utils.normcase(absolute_filename)
 
         changed = False
         mappings = self._mappings_to_server.get(absolute_normalized_filename)
         if mappings:
-
-            i = bisect.bisect(KeyifyList(mappings, lambda entry:entry.line), lineno)
+            i = bisect.bisect(KeyifyList(mappings, lambda entry: entry.line), lineno)
             if i >= len(mappings):
                 i -= 1
 
@@ -150,4 +150,3 @@ class SourceMapping(object):
                 changed = True
 
         return absolute_filename, lineno, changed
-

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_stackless.py

@@ -14,11 +14,11 @@ from _pydev_bundle import pydev_log
 # Used so that we don't loose the id (because we'll remove when it's not alive and would generate a new id for the
 # same tasklet).
 class TaskletToLastId:
-    '''
+    """
     So, why not a WeakKeyDictionary?
     The problem is that removals from the WeakKeyDictionary will create a new tasklet (as it adds a callback to
     remove the key when it's garbage-collected), so, we can get into a recursion.
-    '''
+    """
 
     def __init__(self):
         self.tasklet_ref_to_last_id = {}
@@ -39,11 +39,10 @@ class TaskletToLastId:
 _tasklet_to_last_id = TaskletToLastId()
 
 
-#=======================================================================================================================
+# =======================================================================================================================
 # _TaskletInfo
-#=======================================================================================================================
+# =======================================================================================================================
 class _TaskletInfo:
-
     _last_id = 0
 
     def __init__(self, tasklet_weakref, tasklet):
@@ -64,21 +63,21 @@ class _TaskletInfo:
         tasklet = self.tasklet_weakref()
         if tasklet:
             if tasklet.blocked:
-                state = 'blocked'
+                state = "blocked"
             elif tasklet.paused:
-                state = 'paused'
+                state = "paused"
             elif tasklet.scheduled:
-                state = 'scheduled'
+                state = "scheduled"
             else:
-                state = '<UNEXPECTED>'
+                state = "<UNEXPECTED>"
 
             try:
                 name = tasklet.name
             except AttributeError:
                 if tasklet.is_main:
-                    name = 'MainTasklet'
+                    name = "MainTasklet"
                 else:
-                    name = 'Tasklet-%s' % (self._tasklet_id,)
+                    name = "Tasklet-%s" % (self._tasklet_id,)
 
             thread_id = tasklet.thread_id
             if thread_id != -1:
@@ -100,14 +99,13 @@ class _TaskletInfo:
             tid = id(tasklet)
             tasklet = None
         else:
-            state = 'dead'
-            name = 'Tasklet-%s' % (self._tasklet_id,)
+            state = "dead"
+            name = "Tasklet-%s" % (self._tasklet_id,)
             thread_name = ""
-            tid = '-'
-        self.tasklet_name = '%s %s %s (%s)' % (state, name, thread_name, tid)
+            tid = "-"
+        self.tasklet_name = "%s %s %s (%s)" % (state, name, thread_name, tid)
 
     if not hasattr(stackless.tasklet, "trace_function"):
-
         # bug https://bitbucket.org/stackless-dev/stackless/issue/42
         # is not fixed. Stackless releases before 2014
         def update_name(self):
@@ -117,9 +115,9 @@ class _TaskletInfo:
                     name = tasklet.name
                 except AttributeError:
                     if tasklet.is_main:
-                        name = 'MainTasklet'
+                        name = "MainTasklet"
                     else:
-                        name = 'Tasklet-%s' % (self._tasklet_id,)
+                        name = "Tasklet-%s" % (self._tasklet_id,)
 
                 thread_id = tasklet.thread_id
                 for thread in threading.enumerate():
@@ -137,25 +135,25 @@ class _TaskletInfo:
                 tid = id(tasklet)
                 tasklet = None
             else:
-                name = 'Tasklet-%s' % (self._tasklet_id,)
+                name = "Tasklet-%s" % (self._tasklet_id,)
                 thread_name = ""
-                tid = '-'
-            self.tasklet_name = '%s %s (%s)' % (name, thread_name, tid)
+                tid = "-"
+            self.tasklet_name = "%s %s (%s)" % (name, thread_name, tid)
 
 
 _weak_tasklet_registered_to_info = {}
 
 
-#=======================================================================================================================
+# =======================================================================================================================
 # get_tasklet_info
-#=======================================================================================================================
+# =======================================================================================================================
 def get_tasklet_info(tasklet):
     return register_tasklet_info(tasklet)
 
 
-#=======================================================================================================================
+# =======================================================================================================================
 # register_tasklet_info
-#=======================================================================================================================
+# =======================================================================================================================
 def register_tasklet_info(tasklet):
     r = weakref.ref(tasklet)
     info = _weak_tasklet_registered_to_info.get(r)
@@ -168,13 +166,13 @@ def register_tasklet_info(tasklet):
 _application_set_schedule_callback = None
 
 
-#=======================================================================================================================
+# =======================================================================================================================
 # _schedule_callback
-#=======================================================================================================================
+# =======================================================================================================================
 def _schedule_callback(prev, next):
-    '''
+    """
     Called when a context is stopped or a new context is made runnable.
-    '''
+    """
     try:
         if not prev and not next:
             return
@@ -191,7 +189,7 @@ def _schedule_callback(prev, next):
                 frame = next.frame
                 if frame is current_frame:
                     frame = frame.f_back
-                if hasattr(frame, 'f_trace'):  # Note: can be None (but hasattr should cover for that too).
+                if hasattr(frame, "f_trace"):  # Note: can be None (but hasattr should cover for that too).
                     frame.f_trace = debugger.get_thread_local_trace_func()
 
             debugger = None
@@ -249,14 +247,13 @@ def _schedule_callback(prev, next):
 
 
 if not hasattr(stackless.tasklet, "trace_function"):
-
     # Older versions of Stackless, released before 2014
     # This code does not work reliable! It is affected by several
     # stackless bugs: Stackless issues #44, #42, #40
     def _schedule_callback(prev, next):
-        '''
+        """
         Called when a context is stopped or a new context is made runnable.
-        '''
+        """
         try:
             if not prev and not next:
                 return
@@ -267,7 +264,7 @@ if not hasattr(stackless.tasklet, "trace_function"):
                 # Ok, making next runnable: set the tracing facility in it.
                 debugger = get_global_debugger()
                 if debugger is not None and next.frame:
-                    if hasattr(next.frame, 'f_trace'):
+                    if hasattr(next.frame, "f_trace"):
                         next.frame.f_trace = debugger.get_thread_local_trace_func()
                 debugger = None
 
@@ -316,18 +313,17 @@ if not hasattr(stackless.tasklet, "trace_function"):
 
     _original_setup = stackless.tasklet.setup
 
-    #=======================================================================================================================
+    # =======================================================================================================================
     # setup
-    #=======================================================================================================================
+    # =======================================================================================================================
     def setup(self, *args, **kwargs):
-        '''
+        """
         Called to run a new tasklet: rebind the creation so that we can trace it.
-        '''
+        """
 
         f = self.tempval
 
         def new_f(old_f, args, kwargs):
-
             debugger = get_global_debugger()
             if debugger is not None:
                 debugger.enable_tracing()
@@ -350,21 +346,21 @@ if not hasattr(stackless.tasklet, "trace_function"):
 
         return _original_setup(self, f, args, kwargs)
 
-    #=======================================================================================================================
+    # =======================================================================================================================
     # __call__
-    #=======================================================================================================================
+    # =======================================================================================================================
     def __call__(self, *args, **kwargs):
-        '''
+        """
         Called to run a new tasklet: rebind the creation so that we can trace it.
-        '''
+        """
 
         return setup(self, *args, **kwargs)
 
     _original_run = stackless.run
 
-    #=======================================================================================================================
+    # =======================================================================================================================
     # run
-    #=======================================================================================================================
+    # =======================================================================================================================
     def run(*args, **kwargs):
         debugger = get_global_debugger()
         if debugger is not None:
@@ -374,14 +370,14 @@ if not hasattr(stackless.tasklet, "trace_function"):
         return _original_run(*args, **kwargs)
 
 
-#=======================================================================================================================
+# =======================================================================================================================
 # patch_stackless
-#=======================================================================================================================
+# =======================================================================================================================
 def patch_stackless():
-    '''
+    """
     This function should be called to patch the stackless module so that new tasklets are properly tracked in the
     debugger.
-    '''
+    """
     global _application_set_schedule_callback
     _application_set_schedule_callback = stackless.set_schedule_callback(_schedule_callback)