debugpy 1.8.5__zip → 1.8.7__zip

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/common/messaging.py

@@ -295,7 +295,8 @@ class JsonIOStream(object):
         try:
             while data_written < len(data):
                 written = writer.write(data[data_written:])
-                data_written += written
+                if written is not None:
+                    data_written += written
             writer.flush()
         except Exception as exc:  # pragma: no cover
             self._log_message("<--", value, logger=log.swallow_exception)

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy/server/cli.py

@@ -112,7 +112,7 @@ def set_address(mode):
             port = int(port)
         except Exception:
             port = -1
-        if not (0 <= port < 2 ** 16):
+        if not (0 <= port < 2**16):
             raise ValueError("invalid port number")
 
         options.mode = mode
@@ -191,6 +191,7 @@ switches = [
 ]
 # fmt: on
 
+
 # Consume all the args from argv
 def consume_argv():
     while len(sys.argv) >= 2:
@@ -198,9 +199,10 @@ def consume_argv():
         del sys.argv[1]
         yield value
 
+
 # Consume all the args from a given list
 def consume_args(args: list):
-    if (args is sys.argv):
+    if args is sys.argv:
         yield from consume_argv()
     else:
         while args:
@@ -208,6 +210,7 @@ def consume_args(args: list):
             del args[0]
             yield value
 
+
 # Parse the args from the command line, then from the environment.
 # Args from the environment are only used if they are not already set from the command line.
 def parse_args():
@@ -232,12 +235,14 @@ def parse_args():
     assert options.target_kind is not None
     assert options.address is not None
 
+
 def parse_args_from_command_line(seen: set):
     parse_args_helper(sys.argv, seen)
 
+
 def parse_args_from_environment(seenFromCommandLine: set):
     args = os.environ.get("DEBUGPY_EXTRA_ARGV")
-    if (not args):
+    if not args:
         return
 
     argsList = args.split()
@@ -245,7 +250,13 @@ def parse_args_from_environment(seenFromCommandLine: set):
     seenFromEnvironment = set()
     parse_args_helper(argsList, seenFromCommandLine, seenFromEnvironment, True)
 
-def parse_args_helper(args: list, seenFromCommandLine: set, seenFromEnvironment: set = set(), isFromEnvironment=False):
+
+def parse_args_helper(
+    args: list,
+    seenFromCommandLine: set,
+    seenFromEnvironment: set = set(),
+    isFromEnvironment=False,
+):
     iterator = consume_args(args)
 
     while True:
@@ -264,17 +275,17 @@ def parse_args_helper(args: list, seenFromCommandLine: set, seenFromEnvironment:
             raise ValueError("unrecognized switch " + switch)
 
         # if we're parsing from the command line, and we've already seen the switch on the command line, this is an error
-        if (not isFromEnvironment and switch in seenFromCommandLine):
+        if not isFromEnvironment and switch in seenFromCommandLine:
             raise ValueError("duplicate switch on command line: " + switch)
         # if we're parsing from the environment, and we've already seen the switch in the environment, this is an error
-        elif (isFromEnvironment and switch in seenFromEnvironment):
+        elif isFromEnvironment and switch in seenFromEnvironment:
             raise ValueError("duplicate switch from environment: " + switch)
         # if we're parsing from the environment, and we've already seen the switch on the command line, skip it, since command line takes precedence
-        elif (isFromEnvironment and switch in seenFromCommandLine):
+        elif isFromEnvironment and switch in seenFromCommandLine:
             continue
         # otherwise, the switch is new, so add it to the appropriate set
         else:
-            if (isFromEnvironment):
+            if isFromEnvironment:
                 seenFromEnvironment.add(switch)
             else:
                 seenFromCommandLine.add(switch)
@@ -291,9 +302,10 @@ def parse_args_helper(args: list, seenFromCommandLine: set, seenFromEnvironment:
         # If we're parsing the command line, we're done after we've processed the target
         # Otherwise, we need to keep parsing until all args are consumed, since the target may be set from the command line
         # already, but there might be additional args in the environment that we want to process.
-        if (not isFromEnvironment and options.target is not None):
+        if not isFromEnvironment and options.target is not None:
             break
 
+
 def start_debugging(argv_0):
     # We need to set up sys.argv[0] before invoking either listen() or connect(),
     # because they use it to report the "process" event. Thus, we can't rely on
@@ -304,15 +316,18 @@ def start_debugging(argv_0):
 
     debugpy.configure(options.config)
 
-    if options.mode == "listen" and options.address is not None:
-        debugpy.listen(options.address)
-    elif options.mode == "connect" and options.address is not None:
-        debugpy.connect(options.address, access_token=options.adapter_access_token)
-    else:
-        raise AssertionError(repr(options.mode))
+    if os.environ.get("DEBUGPY_RUNNING", "false") != "true":
+        if options.mode == "listen" and options.address is not None:
+            debugpy.listen(options.address)
+        elif options.mode == "connect" and options.address is not None:
+            debugpy.connect(options.address, access_token=options.adapter_access_token)
+        else:
+            raise AssertionError(repr(options.mode))
+
+        if options.wait_for_client:
+            debugpy.wait_for_client()
 
-    if options.wait_for_client:
-        debugpy.wait_for_client()
+    os.environ["DEBUGPY_RUNNING"] = "true"
 
 
 def run_file():

{debugpy-1.8.5 → debugpy-1.8.7/src/debugpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: debugpy
-Version: 1.8.5
+Version: 1.8.7
 Summary: An implementation of the Debug Adapter Protocol for Python
 Home-page: https://aka.ms/debugpy
 Author: Microsoft Corporation

{debugpy-1.8.5 → debugpy-1.8.7}/src/debugpy.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_additional_thread_info_regula
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_api.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_breakpoints.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_bytecode_utils.py
+src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_bytecode_utils_py311.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_code_to_source.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_collect_bytecode_info.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_comm.py
@@ -115,7 +116,6 @@ src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_stackless.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_suspended_frames.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_thread_lifecycle.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_timeout.py
-src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_trace_api.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_trace_dispatch.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_trace_dispatch_regular.py
 src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_traceproperty.py
@@ -164,6 +164,11 @@ src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/test_ins
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/test_misc.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/test_peephole_opt.py
 src/debugpy/_vendored/pydevd/_pydevd_frame_eval/vendored/bytecode/tests/util_annotation.py
+src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring.py
+src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring_cython.c
+src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring_cython.pxd
+src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring_cython.pyx
+src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/pydevd_sys_monitoring.py
 src/debugpy/_vendored/pydevd/pydev_ipython/README
 src/debugpy/_vendored/pydevd/pydev_ipython/__init__.py
 src/debugpy/_vendored/pydevd/pydev_ipython/inputhook.py

debugpy-1.8.5/src/debugpy/_vendored/pydevd/_pydev_bundle/_pydev_filesystem_encoding.py

@@ -1,41 +0,0 @@
-import sys
-
-
-def __getfilesystemencoding():
-    '''
-    Note: there's a copy of this method in interpreterInfo.py
-    '''
-    try:
-        ret = sys.getfilesystemencoding()
-        if not ret:
-            raise RuntimeError('Unable to get encoding.')
-        return ret
-    except:
-        try:
-            #Handle Jython
-            from java.lang import System  # @UnresolvedImport
-            env = System.getProperty("os.name").lower()
-            if env.find('win') != -1:
-                return 'ISO-8859-1'  #mbcs does not work on Jython, so, use a (hopefully) suitable replacement
-            return 'utf-8'
-        except:
-            pass
-
-        #Only available from 2.3 onwards.
-        if sys.platform == 'win32':
-            return 'mbcs'
-        return 'utf-8'
-
-def getfilesystemencoding():
-    try:
-        ret = __getfilesystemencoding()
-
-        #Check if the encoding is actually there to be used!
-        if hasattr('', 'encode'):
-            ''.encode(ret)
-        if hasattr('', 'decode'):
-            ''.decode(ret)
-
-        return ret
-    except:
-        return 'utf-8'

debugpy-1.8.5/src/debugpy/_vendored/pydevd/_pydev_runfiles/pydev_runfiles_coverage.py

@@ -1,76 +0,0 @@
-import os.path
-import sys
-from _pydevd_bundle.pydevd_constants import Null
-
-
-#=======================================================================================================================
-# get_coverage_files
-#=======================================================================================================================
-def get_coverage_files(coverage_output_dir, number_of_files):
-    base_dir = coverage_output_dir
-    ret = []
-    i = 0
-    while len(ret) < number_of_files:
-        while True:
-            f = os.path.join(base_dir, '.coverage.%s' % i)
-            i += 1
-            if not os.path.exists(f):
-                ret.append(f)
-                break #Break only inner for.
-    return ret
-
-
-#=======================================================================================================================
-# start_coverage_support
-#=======================================================================================================================
-def start_coverage_support(configuration):
-    return start_coverage_support_from_params(
-        configuration.coverage_output_dir, 
-        configuration.coverage_output_file, 
-        configuration.jobs, 
-        configuration.coverage_include, 
-    )
-    
-
-#=======================================================================================================================
-# start_coverage_support_from_params
-#=======================================================================================================================
-def start_coverage_support_from_params(coverage_output_dir, coverage_output_file, jobs, coverage_include):
-    coverage_files = []
-    coverage_instance = Null()
-    if coverage_output_dir or coverage_output_file:
-        try:
-            import coverage #@UnresolvedImport
-        except:
-            sys.stderr.write('Error: coverage module could not be imported\n')
-            sys.stderr.write('Please make sure that the coverage module (http://nedbatchelder.com/code/coverage/)\n')
-            sys.stderr.write('is properly installed in your interpreter: %s\n' % (sys.executable,))
-            
-            import traceback;traceback.print_exc()
-        else:
-            if coverage_output_dir:
-                if not os.path.exists(coverage_output_dir):
-                    sys.stderr.write('Error: directory for coverage output (%s) does not exist.\n' % (coverage_output_dir,))
-                    
-                elif not os.path.isdir(coverage_output_dir):
-                    sys.stderr.write('Error: expected (%s) to be a directory.\n' % (coverage_output_dir,))
-                    
-                else:
-                    n = jobs
-                    if n <= 0:
-                        n += 1
-                    n += 1 #Add 1 more for the current process (which will do the initial import).
-                    coverage_files = get_coverage_files(coverage_output_dir, n)
-                    os.environ['COVERAGE_FILE'] = coverage_files.pop(0)
-                    
-                    coverage_instance = coverage.coverage(source=[coverage_include])
-                    coverage_instance.start()
-                    
-            elif coverage_output_file:
-                #Client of parallel run.
-                os.environ['COVERAGE_FILE'] = coverage_output_file
-                coverage_instance = coverage.coverage(source=[coverage_include])
-                coverage_instance.start()
-                
-    return coverage_files, coverage_instance
-