From 1eeb84d3e9da3bf465c9fcd731834228b507950a Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 9 May 2023 17:07:57 -0400 Subject: style: some clean-ups --- coverage/__init__.py | 2 -- coverage/cmdline.py | 11 +++++------ coverage/inorout.py | 2 +- coverage/lcovreport.py | 1 - pyproject.toml | 3 +++ 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/coverage/__init__.py b/coverage/__init__.py index 054e37df..e3ed2322 100644 --- a/coverage/__init__.py +++ b/coverage/__init__.py @@ -14,8 +14,6 @@ https://coverage.readthedocs.io # so disable its warning. # pylint: disable=useless-import-alias -import sys - from coverage.version import ( __version__ as __version__, version_info as version_info, diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 4498eeec..55f6c793 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -952,13 +952,12 @@ HELP_TOPICS = { Use "{program_name} help " for detailed help on any command. """, - "minimum_help": """\ - Code coverage for Python, version {__version__} {extension_modifier}. Use '{program_name} help' for help. - """, + "minimum_help": ( + "Code coverage for Python, version {__version__} {extension_modifier}. " + + "Use '{program_name} help' for help." + ), - "version": """\ - Coverage.py, version {__version__} {extension_modifier} - """, + "version": "Coverage.py, version {__version__} {extension_modifier}", } diff --git a/coverage/inorout.py b/coverage/inorout.py index ff46bac0..d2dbdcdf 100644 --- a/coverage/inorout.py +++ b/coverage/inorout.py @@ -528,7 +528,7 @@ class InOrOut: Yields pairs: file path, and responsible plug-in name. """ for pkg in self.source_pkgs: - if (not pkg in sys.modules or + if (pkg not in sys.modules or not module_has_file(sys.modules[pkg])): continue pkg_file = source_for_file(cast(str, sys.modules[pkg].__file__)) diff --git a/coverage/lcovreport.py b/coverage/lcovreport.py index 7d72e813..b9fe2568 100644 --- a/coverage/lcovreport.py +++ b/coverage/lcovreport.py @@ -18,7 +18,6 @@ from coverage.types import TMorf if TYPE_CHECKING: from coverage import Coverage - from coverage.data import CoverageData class LcovReporter: diff --git a/pyproject.toml b/pyproject.toml index 6b02c6a4..cf9c2c0e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,6 +54,9 @@ balanced_clumps = [ "GetZipBytesTest", ] +[tool.ruff] +line-length = 100 + [tool.scriv] # Changelog management: https://pypi.org/project/scriv/ format = "rst" -- cgit v1.2.1