style: ruff check --fix --fixable=I001,Q000 coverage/*.py

Author: nedbat

coverage/__init__.py

@@ -11,6 +11,8 @@
 
 from __future__ import annotations
 
+# isort: skip_file
+
 # mypy's convention is that "import as" names are public from the module.
 # We import names as themselves to indicate that. Pylint sees it as pointless,
 # so disable its warning.

coverage/__main__.py

@@ -6,5 +6,7 @@
 from __future__ import annotations
 
 import sys
+
 from coverage.cmdline import main
+
 sys.exit(main())

coverage/annotate.py

@@ -7,9 +7,8 @@
 
 import os
 import re
-
-from typing import TYPE_CHECKING
 from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from coverage.files import flat_rootname
 from coverage.misc import ensure_dir, isolate_module

coverage/bytecode.py

@@ -7,10 +7,9 @@
 
 import collections
 import dis
-
+from collections.abc import Iterator
 from types import CodeType
 from typing import Iterable, Optional
-from collections.abc import Iterator
 
 from coverage.types import TArc, TOffset
 

coverage/cmdline.py

@@ -15,18 +15,16 @@
 import textwrap
 import traceback
 import types
-
-from typing import cast, Any, NoReturn
+from typing import Any, NoReturn, cast
 
 import coverage
-from coverage import Coverage
-from coverage import env
+from coverage import Coverage, env
 from coverage.config import CoverageConfig
 from coverage.control import DEFAULT_DATAFILE
 from coverage.core import CTRACER_FILE
 from coverage.data import combinable_files, debug_data_file
 from coverage.debug import info_header, short_stack, write_formatted_info
-from coverage.exceptions import _BaseCoverageException, _ExceptionDuringRun, NoSource
+from coverage.exceptions import NoSource, _BaseCoverageException, _ExceptionDuringRun
 from coverage.execfile import PyRunner
 from coverage.results import display_covered, should_fail_under
 from coverage.version import __url__
@@ -190,8 +188,8 @@ class Opts:
         ),
     )
     save_signal = optparse.make_option(
-        '', '--save-signal', action='store', metavar='SIGNAL',
-        choices = ['USR1', 'USR2'],
+        "", "--save-signal", action="store", metavar="SIGNAL",
+        choices = ["USR1", "USR2"],
         help=(
             "Specify a signal that will trigger coverage to write its collected data. " +
             "Supported values are: USR1, USR2. Not available on Windows."
@@ -1015,7 +1013,7 @@ def main(argv: list[str] | None = None) -> int | None:
 # $set_env.py: COVERAGE_PROFILE - Set to use ox_profile.
 _profile = os.getenv("COVERAGE_PROFILE")
 if _profile:                                                # pragma: debugging
-    from ox_profile.core.launchers import SimpleLauncher    # pylint: disable=import-error
+    from ox_profile.core.launchers import SimpleLauncher  # pylint: disable=import-error
     original_main = main
 
     def main(                                               # pylint: disable=function-redefined

coverage/collector.py

@@ -9,10 +9,9 @@
 import functools
 import os
 import sys
-
 from collections.abc import Mapping
 from types import FrameType
-from typing import cast, Any, Callable, TypeVar
+from typing import Any, Callable, TypeVar, cast
 
 from coverage import env
 from coverage.config import CoverageConfig
@@ -26,11 +25,11 @@
     TArc,
     TCheckIncludeFn,
     TFileDisposition,
+    Tracer,
     TShouldStartContextFn,
     TShouldTraceFn,
     TTraceData,
     TTraceFn,
-    Tracer,
     TWarnFn,
 )
 
@@ -146,11 +145,11 @@ def __init__(
                 self.concur_id_func = greenlet.getcurrent
             elif "eventlet" in concurrencies:
                 tried = "eventlet"
-                import eventlet.greenthread     # pylint: disable=import-error,useless-suppression
+                import eventlet.greenthread  # pylint: disable=import-error,useless-suppression
                 self.concur_id_func = eventlet.greenthread.getcurrent
             elif "gevent" in concurrencies:
                 tried = "gevent"
-                import gevent                   # pylint: disable=import-error,useless-suppression
+                import gevent  # pylint: disable=import-error,useless-suppression
                 self.concur_id_func = gevent.getcurrent
 
             if "thread" in concurrencies:
@@ -222,7 +221,7 @@ def reset(self) -> None:
         # being excluded by the inclusion rules, in which case the
         # FileDisposition will be replaced by None in the cache.
         if env.PYPY:
-            import __pypy__                     # pylint: disable=import-error
+            import __pypy__  # pylint: disable=import-error
             # Alex Gaynor said:
             # should_trace_cache is a strictly growing key: once a key is in
             # it, it never changes.  Further, the keys used to access it are
@@ -267,19 +266,19 @@ def _start_tracer(self) -> TTraceFn | None:
         tracer.should_trace_cache = self.should_trace_cache
         tracer.warn = self.warn
 
-        if hasattr(tracer, 'concur_id_func'):
+        if hasattr(tracer, "concur_id_func"):
             tracer.concur_id_func = self.concur_id_func
-        if hasattr(tracer, 'file_tracers'):
+        if hasattr(tracer, "file_tracers"):
             tracer.file_tracers = self.file_tracers
-        if hasattr(tracer, 'threading'):
+        if hasattr(tracer, "threading"):
             tracer.threading = self.threading
-        if hasattr(tracer, 'check_include'):
+        if hasattr(tracer, "check_include"):
             tracer.check_include = self.check_include
-        if hasattr(tracer, 'should_start_context'):
+        if hasattr(tracer, "should_start_context"):
             tracer.should_start_context = self.should_start_context
-        if hasattr(tracer, 'switch_context'):
+        if hasattr(tracer, "switch_context"):
             tracer.switch_context = self.switch_context
-        if hasattr(tracer, 'disable_plugin'):
+        if hasattr(tracer, "disable_plugin"):
             tracer.disable_plugin = self.disable_plugin
 
         fn = tracer.start()

coverage/config.py

@@ -11,18 +11,25 @@
 import os
 import os.path
 import re
-
+from collections.abc import Iterable
 from typing import (
-    Any, Callable, Final, Mapping, Union,
+    Any,
+    Callable,
+    Final,
+    Mapping,
+    Union,
 )
-from collections.abc import Iterable
 
 from coverage.exceptions import ConfigError
-from coverage.misc import isolate_module, human_sorted_items, substitute_variables
+from coverage.misc import human_sorted_items, isolate_module, substitute_variables
 from coverage.tomlconfig import TomlConfigParser, TomlDecodeError
 from coverage.types import (
-    TConfigurable, TConfigSectionIn, TConfigValueIn, TConfigSectionOut,
-    TConfigValueOut, TPluginConfig,
+    TConfigSectionIn,
+    TConfigSectionOut,
+    TConfigurable,
+    TConfigValueIn,
+    TConfigValueOut,
+    TPluginConfig,
 )
 
 os = isolate_module(os)

coverage/context.py

@@ -5,8 +5,8 @@
 
 from __future__ import annotations
 
-from types import FrameType
 from collections.abc import Sequence
+from types import FrameType
 
 from coverage.types import TShouldStartContextFn
 

coverage/control.py

@@ -17,20 +17,23 @@
 import threading
 import time
 import warnings
-
-from types import FrameType
-from typing import cast, Any, Callable, IO, Union
 from collections.abc import Iterable, Iterator
+from types import FrameType
+from typing import IO, Any, Callable, Union, cast
 
 from coverage import env
 from coverage.annotate import AnnotateReporter
 from coverage.collector import Collector
 from coverage.config import CoverageConfig, read_coverage_config
-from coverage.context import should_start_context_test_function, combine_context_switchers
-from coverage.core import Core, CTRACER_FILE
+from coverage.context import combine_context_switchers, should_start_context_test_function
+from coverage.core import CTRACER_FILE, Core
 from coverage.data import CoverageData, combine_parallel_data
 from coverage.debug import (
-    DebugControl, NoDebugging, short_stack, write_formatted_info, relevant_environment_display,
+    DebugControl,
+    NoDebugging,
+    relevant_environment_display,
+    short_stack,
+    write_formatted_info,
 )
 from coverage.disposition import disposition_debug_msg
 from coverage.exceptions import ConfigError, CoverageException, CoverageWarning, PluginError
@@ -39,8 +42,13 @@
 from coverage.inorout import InOrOut
 from coverage.jsonreport import JsonReporter
 from coverage.lcovreport import LcovReporter
-from coverage.misc import bool_or_none, join_regex
-from coverage.misc import DefaultValue, ensure_dir_for_file, isolate_module
+from coverage.misc import (
+    DefaultValue,
+    bool_or_none,
+    ensure_dir_for_file,
+    isolate_module,
+    join_regex,
+)
 from coverage.multiproc import patch_multiprocessing
 from coverage.patch import apply_patches
 from coverage.plugin import FileReporter
@@ -50,8 +58,14 @@
 from coverage.report_core import render_report
 from coverage.results import Analysis, analysis_from_file_reporter
 from coverage.types import (
-    FilePath, TConfigurable, TConfigSectionIn, TConfigValueIn, TConfigValueOut,
-    TFileDisposition, TLineNo, TMorf
+    FilePath,
+    TConfigSectionIn,
+    TConfigurable,
+    TConfigValueIn,
+    TConfigValueOut,
+    TFileDisposition,
+    TLineNo,
+    TMorf,
 )
 from coverage.xmlreport import XmlReporter
 
@@ -1362,7 +1376,7 @@ def plugin_info(plugins: list[Any]) -> list[str]:
             ("platform", platform.platform()),
             ("implementation", platform.python_implementation()),
             ("build", platform.python_build()),
-            ("gil_enabled", getattr(sys, '_is_gil_enabled', lambda: True)()),
+            ("gil_enabled", getattr(sys, "_is_gil_enabled", lambda: True)()),
             ("executable", sys.executable),
             ("def_encoding", sys.getdefaultencoding()),
             ("fs_encoding", sys.getfilesystemencoding()),

coverage/core.py

@@ -18,11 +18,10 @@
 from coverage.sysmon import SysMonitor
 from coverage.types import (
     TFileDisposition,
-    TWarnFn,
     Tracer,
+    TWarnFn,
 )
 
-
 os = isolate_module(os)
 
 IMPORT_ERROR: str = ""