debugpy 1.8.5__zip → 1.8.7__zip

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydev_bundle/_pydev_jy_imports_tipper.py

@@ -12,48 +12,49 @@ from org.python import core  # @UnresolvedImport
 from org.python.core import PyClass  # @UnresolvedImport
 
 # completion types.
-TYPE_IMPORT = '0'
-TYPE_CLASS = '1'
-TYPE_FUNCTION = '2'
-TYPE_ATTR = '3'
-TYPE_BUILTIN = '4'
-TYPE_PARAM = '5'
+TYPE_IMPORT = "0"
+TYPE_CLASS = "1"
+TYPE_FUNCTION = "2"
+TYPE_ATTR = "3"
+TYPE_BUILTIN = "4"
+TYPE_PARAM = "5"
 
 
 def _imp(name):
     try:
         return __import__(name)
     except:
-        if '.' in name:
-            sub = name[0:name.rfind('.')]
+        if "." in name:
+            sub = name[0 : name.rfind(".")]
             return _imp(sub)
         else:
-            s = 'Unable to import module: %s - sys.path: %s' % (str(name), sys.path)
+            s = "Unable to import module: %s - sys.path: %s" % (str(name), sys.path)
             raise RuntimeError(s)
 
 
 import java.util
-_java_rt_file = getattr(java.util, '__file__', None)
+
+_java_rt_file = getattr(java.util, "__file__", None)
 
 
 def Find(name):
     f = None
-    if name.startswith('__builtin__'):
-        if name == '__builtin__.str':
-            name = 'org.python.core.PyString'
-        elif name == '__builtin__.dict':
-            name = 'org.python.core.PyDictionary'
+    if name.startswith("__builtin__"):
+        if name == "__builtin__.str":
+            name = "org.python.core.PyString"
+        elif name == "__builtin__.dict":
+            name = "org.python.core.PyDictionary"
 
     mod = _imp(name)
     parent = mod
-    foundAs = ''
+    foundAs = ""
 
     try:
-        f = getattr(mod, '__file__', None)
+        f = getattr(mod, "__file__", None)
     except:
         f = None
 
-    components = name.split('.')
+    components = name.split(".")
     old_comp = None
     for comp in components[1:]:
         try:
@@ -65,98 +66,95 @@ def Find(name):
             if old_comp != comp:
                 raise
 
-        if hasattr(mod, '__file__'):
+        if hasattr(mod, "__file__"):
             f = mod.__file__
         else:
             if len(foundAs) > 0:
-                foundAs = foundAs + '.'
+                foundAs = foundAs + "."
             foundAs = foundAs + comp
 
         old_comp = comp
 
-    if f is None and name.startswith('java.lang'):
+    if f is None and name.startswith("java.lang"):
         # Hack: java.lang.__file__ is None on Jython 2.7 (whereas it pointed to rt.jar on Jython 2.5).
         f = _java_rt_file
 
     if f is not None:
-        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, mod, parent, foundAs
 
 
 def format_param_class_name(paramClassName):
-    if paramClassName.startswith('<type \'') and paramClassName.endswith('\'>'):
-        paramClassName = paramClassName[len('<type \''):-2]
-    if paramClassName.startswith('['):
-        if paramClassName == '[C':
-            paramClassName = 'char[]'
+    if paramClassName.startswith("<type '") and paramClassName.endswith("'>"):
+        paramClassName = paramClassName[len("<type '") : -2]
+    if paramClassName.startswith("["):
+        if paramClassName == "[C":
+            paramClassName = "char[]"
 
-        elif paramClassName == '[B':
-            paramClassName = 'byte[]'
+        elif paramClassName == "[B":
+            paramClassName = "byte[]"
 
-        elif paramClassName == '[I':
-            paramClassName = 'int[]'
+        elif paramClassName == "[I":
+            paramClassName = "int[]"
 
-        elif paramClassName.startswith('[L') and paramClassName.endswith(';'):
+        elif paramClassName.startswith("[L") and paramClassName.endswith(";"):
             paramClassName = paramClassName[2:-1]
-            paramClassName += '[]'
+            paramClassName += "[]"
     return paramClassName
 
 
 def generate_tip(data, log=None):
-    data = data.replace('\n', '')
-    if data.endswith('.'):
-        data = data.rstrip('.')
+    data = data.replace("\n", "")
+    if data.endswith("."):
+        data = data.rstrip(".")
 
     f, mod, parent, foundAs = Find(data)
     tips = generate_imports_tip_for_module(mod)
     return f, tips
 
 
-#=======================================================================================================================
+# =======================================================================================================================
 # Info
-#=======================================================================================================================
+# =======================================================================================================================
 class Info:
-
     def __init__(self, name, **kwargs):
         self.name = name
-        self.doc = kwargs.get('doc', None)
-        self.args = kwargs.get('args', ())  # tuple of strings
-        self.varargs = kwargs.get('varargs', None)  # string
-        self.kwargs = kwargs.get('kwargs', None)  # string
-        self.ret = kwargs.get('ret', None)  # string
+        self.doc = kwargs.get("doc", None)
+        self.args = kwargs.get("args", ())  # tuple of strings
+        self.varargs = kwargs.get("varargs", None)  # string
+        self.kwargs = kwargs.get("kwargs", None)  # string
+        self.ret = kwargs.get("ret", None)  # string
 
     def basic_as_str(self):
-        '''@returns this class information as a string (just basic format)
-        '''
+        """@returns this class information as a string (just basic format)"""
         args = self.args
-        s = 'function:%s args=%s, varargs=%s, kwargs=%s, docs:%s' % \
-            (self.name, args, self.varargs, self.kwargs, self.doc)
+        s = "function:%s args=%s, varargs=%s, kwargs=%s, docs:%s" % (self.name, args, self.varargs, self.kwargs, self.doc)
         return s
 
     def get_as_doc(self):
         s = str(self.name)
         if self.doc:
-            s += '\n@doc %s\n' % str(self.doc)
+            s += "\n@doc %s\n" % str(self.doc)
 
         if self.args:
-            s += '\n@params '
+            s += "\n@params "
             for arg in self.args:
                 s += str(format_param_class_name(arg))
-                s += '  '
+                s += "  "
 
         if self.varargs:
-            s += '\n@varargs '
+            s += "\n@varargs "
             s += str(self.varargs)
 
         if self.kwargs:
-            s += '\n@kwargs '
+            s += "\n@kwargs "
             s += str(self.kwargs)
 
         if self.ret:
-            s += '\n@return '
+            s += "\n@return "
             s += str(format_param_class_name(str(self.ret)))
 
         return str(s)
@@ -167,7 +165,7 @@ def isclass(cls):
 
 
 def ismethod(func):
-    '''this function should return the information gathered on a function
+    """this function should return the information gathered on a function
 
     @param func: this is the function we want to get info on
     @return a tuple where:
@@ -175,7 +173,7 @@ def ismethod(func):
         1 = a list of classes 'Info', with the info gathered from the function
             this is a list because when we have methods from java with the same name and different signatures,
             we actually have many methods, each with its own set of arguments
-    '''
+    """
 
     try:
         if isinstance(func, core.PyFunction):
@@ -194,8 +192,9 @@ def ismethod(func):
                 args = list(names[:nargs])
                 step = 0
 
-                if not hasattr(func_code, 'CO_VARARGS'):
+                if not hasattr(func_code, "CO_VARARGS"):
                     from org.python.core import CodeFlag  # @UnresolvedImport
+
                     co_varargs_flag = CodeFlag.CO_VARARGS.flag
                     co_varkeywords_flag = CodeFlag.CO_VARKEYWORDS.flag
                 else:
@@ -245,7 +244,7 @@ def ismethod(func):
                     try:
                         ret = met.getReturnType()
                     except AttributeError:
-                        ret = ''
+                        ret = ""
                     parameterTypes = met.getParameterTypes()
 
                     args = []
@@ -259,7 +258,7 @@ def ismethod(func):
                         except AttributeError:
                             try:
                                 paramClassName = repr(paramTypesClass)  # should be something like <type 'object'>
-                                paramClassName = paramClassName.split('\'')[1]
+                                paramClassName = paramClassName.split("'")[1]
                             except:
                                 paramClassName = repr(paramTypesClass)  # just in case something else happens... it will at least be visible
                         # if the parameter equals [C, it means it it a char array, so, let's change it
@@ -281,16 +280,15 @@ def ismethod(func):
     except Exception:
         s = StringIO()
         traceback.print_exc(file=s)
-        return 1, [Info(str('ERROR'), doc=s.getvalue())]
+        return 1, [Info(str("ERROR"), doc=s.getvalue())]
 
     return 0, None
 
 
 def ismodule(mod):
     # java modules... do we have other way to know that?
-    if not hasattr(mod, 'getClass') and not hasattr(mod, '__class__') \
-       and hasattr(mod, '__name__'):
-            return 1
+    if not hasattr(mod, "getClass") and not hasattr(mod, "__class__") and hasattr(mod, "__name__"):
+        return 1
 
     return isinstance(mod, core.PyModule)
 
@@ -299,9 +297,8 @@ def dir_obj(obj):
     ret = []
     found = java.util.HashMap()
     original = obj
-    if hasattr(obj, '__class__'):
+    if hasattr(obj, "__class__"):
         if obj.__class__ == java.lang.Class:
-
             # get info about superclasses
             classes = []
             classes.append(obj)
@@ -364,16 +361,15 @@ def dir_obj(obj):
 
 
 def format_arg(arg):
-    '''formats an argument to be shown
-    '''
+    """formats an argument to be shown"""
 
     s = str(arg)
-    dot = s.rfind('.')
+    dot = s.rfind(".")
     if dot >= 0:
-        s = s[dot + 1:]
+        s = s[dot + 1 :]
 
-    s = s.replace(';', '')
-    s = s.replace('[]', 'Array')
+    s = s.replace(";", "")
+    s = s.replace("[]", "Array")
     if len(s) > 0:
         c = s[0].lower()
         s = c + s[1:]
@@ -382,12 +378,11 @@ def format_arg(arg):
 
 
 def search_definition(data):
-    '''@return file, line, col
-    '''
+    """@return file, line, col"""
 
-    data = data.replace('\n', '')
-    if data.endswith('.'):
-        data = data.rstrip('.')
+    data = data.replace("\n", "")
+    if data.endswith("."):
+        data = data.rstrip(".")
     f, mod, parent, foundAs = Find(data)
     try:
         return do_find(f, mod), foundAs
@@ -395,30 +390,29 @@ def search_definition(data):
         return do_find(f, parent), foundAs
 
 
-def generate_imports_tip_for_module(obj_to_complete, dir_comps=None, getattr=getattr, filter=lambda name:True):
-    '''
-        @param obj_to_complete: the object from where we should get the completions
-        @param dir_comps: if passed, we should not 'dir' the object and should just iterate those passed as a parameter
-        @param getattr: the way to get a given object from the obj_to_complete (used for the completer)
-        @param filter: a callable that receives the name and decides if it should be appended or not to the results
-        @return: list of tuples, so that each tuple represents a completion with:
-            name, doc, args, type (from the TYPE_* constants)
-    '''
+def generate_imports_tip_for_module(obj_to_complete, dir_comps=None, getattr=getattr, filter=lambda name: True):
+    """
+    @param obj_to_complete: the object from where we should get the completions
+    @param dir_comps: if passed, we should not 'dir' the object and should just iterate those passed as a parameter
+    @param getattr: the way to get a given object from the obj_to_complete (used for the completer)
+    @param filter: a callable that receives the name and decides if it should be appended or not to the results
+    @return: list of tuples, so that each tuple represents a completion with:
+        name, doc, args, type (from the TYPE_* constants)
+    """
     ret = []
 
     if dir_comps is None:
         dir_comps = dir_obj(obj_to_complete)
 
     for d in dir_comps:
-
         if d is None:
             continue
 
         if not filter(d):
             continue
 
-        args = ''
-        doc = ''
+        args = ""
+        doc = ""
         retType = TYPE_BUILTIN
 
         try:
@@ -452,26 +446,25 @@ def generate_imports_tip_for_module(obj_to_complete, dir_comps=None, getattr=get
             #
             # whereas if we had added the jar to the classpath before, everything would be fine by now...
 
-            ret.append((d, '', '', retType))
+            ret.append((d, "", "", retType))
             # that's ok, private things cannot be gotten...
             continue
         else:
-
             isMet = ismethod(obj)
             if isMet[0] and isMet[1]:
                 info = isMet[1][0]
                 try:
                     args, vargs, kwargs = info.args, info.varargs, info.kwargs
                     doc = info.get_as_doc()
-                    r = ''
-                    for a in (args):
+                    r = ""
+                    for a in args:
                         if len(r) > 0:
-                            r += ', '
+                            r += ", "
                         r += format_arg(a)
-                    args = '(%s)' % (r)
+                    args = "(%s)" % (r)
                 except TypeError:
                     traceback.print_exc()
-                    args = '()'
+                    args = "()"
 
                 retType = TYPE_FUNCTION
 
@@ -488,5 +481,5 @@ def generate_imports_tip_for_module(obj_to_complete, dir_comps=None, getattr=get
 
 
 if __name__ == "__main__":
-    sys.path.append(r'D:\dev_programs\eclipse_3\310\eclipse\plugins\org.junit_3.8.1\junit.jar')
-    sys.stdout.write('%s\n' % Find('junit.framework.TestCase'))
+    sys.path.append(r"D:\dev_programs\eclipse_3\310\eclipse\plugins\org.junit_3.8.1\junit.jar")
+    sys.stdout.write("%s\n" % Find("junit.framework.TestCase"))

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydev_bundle/_pydev_log.py

@@ -4,12 +4,11 @@ from io import StringIO
 
 
 class Log:
-
     def __init__(self):
         self._contents = []
 
     def add_content(self, *content):
-        self._contents.append(' '.join(content))
+        self._contents.append(" ".join(content))
 
     def add_exception(self):
         s = StringIO()
@@ -18,7 +17,7 @@ class Log:
         self._contents.append(s.getvalue())
 
     def get_contents(self):
-        return '\n'.join(self._contents)
+        return "\n".join(self._contents)
 
     def clear_log(self):
         del self._contents[:]

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydev_bundle/_pydev_saved_modules.py

@@ -10,10 +10,10 @@ def find_in_pythonpath(module_name):
     # this should be rare in general).
     found_at = []
 
-    parts = module_name.split('.')  # split because we need to convert mod.name to mod/name
+    parts = module_name.split(".")  # split because we need to convert mod.name to mod/name
     for path in sys.path:
         target = os.path.join(path, *parts)
-        target_py = target + '.py'
+        target_py = target + ".py"
         if os.path.isdir(target):
             found_at.append(target)
         if os.path.exists(target_py):
@@ -26,7 +26,6 @@ class DebuggerInitializationError(Exception):
 
 
 class VerifyShadowedImport(object):
-
     def __init__(self, import_name):
         self.import_name = import_name
 
@@ -53,17 +52,19 @@ class VerifyShadowedImport(object):
             raise DebuggerInitializationError(msg)
 
     def _generate_shadowed_import_message(self, found_at):
-        msg = '''It was not possible to initialize the debugger due to a module name conflict.
+        msg = """It was not possible to initialize the debugger due to a module name conflict.
 
 i.e.: the module "%(import_name)s" could not be imported because it is shadowed by:
 %(found_at)s
-Please rename this file/folder so that the original module from the standard library can be imported.''' % {
-    'import_name': self.import_name, 'found_at': found_at[0]}
+Please rename this file/folder so that the original module from the standard library can be imported.""" % {
+            "import_name": self.import_name,
+            "found_at": found_at[0],
+        }
 
         return msg
 
     def check(self, module, expected_attributes):
-        msg = ''
+        msg = ""
         for expected_attribute in expected_attributes:
             try:
                 getattr(module, expected_attribute)
@@ -75,35 +76,58 @@ Please rename this file/folder so that the original module from the standard lib
             raise DebuggerInitializationError(msg)
 
 
-with VerifyShadowedImport('threading') as verify_shadowed:
-    import threading;    verify_shadowed.check(threading, ['Thread', 'settrace', 'setprofile', 'Lock', 'RLock', 'current_thread'])
+with VerifyShadowedImport("threading") as verify_shadowed:
+    import threading
+
+    verify_shadowed.check(threading, ["Thread", "settrace", "setprofile", "Lock", "RLock", "current_thread"])
+    ThreadingEvent = threading.Event
+    ThreadingLock = threading.Lock
+    threading_current_thread = threading.current_thread
+
+with VerifyShadowedImport("time") as verify_shadowed:
+    import time
+
+    verify_shadowed.check(time, ["sleep", "time", "mktime"])
+
+with VerifyShadowedImport("socket") as verify_shadowed:
+    import socket
+
+    verify_shadowed.check(socket, ["socket", "gethostname", "getaddrinfo"])
+
+with VerifyShadowedImport("select") as verify_shadowed:
+    import select
+
+    verify_shadowed.check(select, ["select"])
+
+with VerifyShadowedImport("code") as verify_shadowed:
+    import code as _code
+
+    verify_shadowed.check(_code, ["compile_command", "InteractiveInterpreter"])
+
+with VerifyShadowedImport("_thread") as verify_shadowed:
+    import _thread as thread
 
-with VerifyShadowedImport('time') as verify_shadowed:
-    import time;    verify_shadowed.check(time, ['sleep', 'time', 'mktime'])
+    verify_shadowed.check(thread, ["start_new_thread", "start_new", "allocate_lock"])
 
-with VerifyShadowedImport('socket') as verify_shadowed:
-    import socket;    verify_shadowed.check(socket, ['socket', 'gethostname', 'getaddrinfo'])
+with VerifyShadowedImport("queue") as verify_shadowed:
+    import queue as _queue
 
-with VerifyShadowedImport('select') as verify_shadowed:
-    import select;    verify_shadowed.check(select, ['select'])
+    verify_shadowed.check(_queue, ["Queue", "LifoQueue", "Empty", "Full", "deque"])
 
-with VerifyShadowedImport('code') as verify_shadowed:
-    import code as _code;    verify_shadowed.check(_code, ['compile_command', 'InteractiveInterpreter'])
+with VerifyShadowedImport("xmlrpclib") as verify_shadowed:
+    import xmlrpc.client as xmlrpclib
 
-with VerifyShadowedImport('_thread') as verify_shadowed:
-    import _thread as thread;    verify_shadowed.check(thread, ['start_new_thread', 'start_new', 'allocate_lock'])
+    verify_shadowed.check(xmlrpclib, ["ServerProxy", "Marshaller", "Server"])
 
-with VerifyShadowedImport('queue') as verify_shadowed:
-    import queue as _queue;    verify_shadowed.check(_queue, ['Queue', 'LifoQueue', 'Empty', 'Full', 'deque'])
+with VerifyShadowedImport("xmlrpc.server") as verify_shadowed:
+    import xmlrpc.server as xmlrpcserver
 
-with VerifyShadowedImport('xmlrpclib') as verify_shadowed:
-    import xmlrpc.client as xmlrpclib;    verify_shadowed.check(xmlrpclib, ['ServerProxy', 'Marshaller', 'Server'])
+    verify_shadowed.check(xmlrpcserver, ["SimpleXMLRPCServer"])
 
-with VerifyShadowedImport('xmlrpc.server') as verify_shadowed:
-    import xmlrpc.server as xmlrpcserver;    verify_shadowed.check(xmlrpcserver, ['SimpleXMLRPCServer'])
+with VerifyShadowedImport("http.server") as verify_shadowed:
+    import http.server as BaseHTTPServer
 
-with VerifyShadowedImport('http.server') as verify_shadowed:
-    import http.server as BaseHTTPServer;    verify_shadowed.check(BaseHTTPServer, ['BaseHTTPRequestHandler'])
+    verify_shadowed.check(BaseHTTPServer, ["BaseHTTPRequestHandler"])
 
 # If set, this is a version of the threading.enumerate that doesn't have the patching to remove the pydevd threads.
 # Note: as it can't be set during execution, don't import the name (import the module and access it through its name).

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydev_bundle/_pydev_sys_patch.py

@@ -2,9 +2,7 @@ import sys
 
 
 def patch_sys_module():
-
     def patched_exc_info(fun):
-
         def pydev_debugger_exc_info():
             type, value, traceback = fun()
             if type == ImportError:
@@ -22,7 +20,6 @@ def patch_sys_module():
 
 
 def patched_reload(orig_reload):
-
     def pydev_debugger_reload(module):
         orig_reload(module)
         if module.__name__ == "sys":
@@ -40,13 +37,15 @@ def patch_reload():
         builtins.reload = patched_reload(sys.builtin_orig_reload)  # @UndefinedVariable
         try:
             import imp
+
             sys.imp_orig_reload = imp.reload
             imp.reload = patched_reload(sys.imp_orig_reload)  # @UndefinedVariable
-        except:
-            pass
+        except ImportError:
+            pass  # Ok, imp not available on Python 3.12.
     else:
         try:
             import importlib
+
             sys.importlib_orig_reload = importlib.reload  # @UndefinedVariable
             importlib.reload = patched_reload(sys.importlib_orig_reload)  # @UndefinedVariable
         except:
@@ -63,11 +62,16 @@ def cancel_patches_in_sys_module():
         builtins.reload = sys.builtin_orig_reload
 
     if hasattr(sys, "imp_orig_reload"):
-        import imp
-        imp.reload = sys.imp_orig_reload
+        try:
+            import imp
+
+            imp.reload = sys.imp_orig_reload
+        except ImportError:
+            pass  # Ok, imp not available in Python 3.12.
 
     if hasattr(sys, "importlib_orig_reload"):
         import importlib
+
         importlib.reload = sys.importlib_orig_reload
 
     del builtins

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/_vendored/pydevd/_pydev_bundle/_pydev_tipper_common.py

@@ -4,6 +4,7 @@ import re
 
 def do_find(f, mod):
     import linecache
+
     if inspect.ismodule(mod):
         return f, 0, 0
 
@@ -11,7 +12,7 @@ def do_find(f, mod):
 
     if inspect.isclass(mod):
         name = mod.__name__
-        pat = re.compile(r'^\s*class\s*' + name + r'\b')
+        pat = re.compile(r"^\s*class\s*" + name + r"\b")
         for i in range(len(lines)):
             if pat.match(lines[i]):
                 return f, i, 0
@@ -34,14 +35,14 @@ def do_find(f, mod):
         mod = mod.f_code
 
     if inspect.iscode(mod):
-        if not hasattr(mod, 'co_filename'):
+        if not hasattr(mod, "co_filename"):
             return None, 0, 0
 
-        if not hasattr(mod, 'co_firstlineno'):
+        if not hasattr(mod, "co_firstlineno"):
             return mod.co_filename, 0, 0
 
         lnum = mod.co_firstlineno
-        pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
+        pat = re.compile(r"^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)")
         while lnum > 0:
             if pat.match(lines[lnum]):
                 break
@@ -49,4 +50,4 @@ def do_find(f, mod):
 
         return f, lnum, 0
 
-    raise RuntimeError('Do not know about: ' + f + ' ' + str(mod))
+    raise RuntimeError("Do not know about: " + f + " " + str(mod))