refactor: pyupgrade --py310-plus *.py coverage/*.py tests/*.py ci/*.py

nedbat · nedbat · commit c4ec6e17a4c9 · 2025-12-11T21:16:13.000-05:00
diff --git a/ci/comment_on_fixes.py b/ci/comment_on_fixes.py
@@ -28,7 +28,7 @@
 
 repo_owner = sys.argv[1]
 url_matches = re.finditer(rf"https://github.com/{repo_owner}/(issues|pull)/(\d+)", text)
-urls = set((m[0], m[1], m[2]) for m in url_matches)
+urls = {(m[0], m[1], m[2]) for m in url_matches}
 
 for url, kind, number in urls:
     do_comment = False
diff --git a/coverage/bytecode.py b/coverage/bytecode.py
@@ -7,8 +7,9 @@
 
 import collections
 import dis
+from collections.abc import Iterable, Mapping
 from types import CodeType
-from typing import Iterable, Mapping, Optional
+from typing import Optional
 
 from coverage.types import TArc, TLineNo, TOffset
 
diff --git a/coverage/collector.py b/coverage/collector.py
@@ -9,9 +9,9 @@
 import functools
 import os
 import sys
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from types import FrameType
-from typing import Any, Callable, TypeVar, cast
+from typing import Any, TypeVar, cast
 
 from coverage import env
 from coverage.core import Core
diff --git a/coverage/config.py b/coverage/config.py
@@ -13,8 +13,8 @@
 import os
 import os.path
 import re
-from collections.abc import Iterable
-from typing import Any, Callable, Final, Mapping
+from collections.abc import Callable, Iterable, Mapping
+from typing import Any, Final
 
 from coverage.exceptions import ConfigError
 from coverage.misc import human_sorted_items, isolate_module, substitute_variables
diff --git a/coverage/control.py b/coverage/control.py
@@ -17,9 +17,9 @@
 import threading
 import time
 import warnings
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from types import FrameType
-from typing import IO, Any, Callable, cast
+from typing import IO, Any, cast
 
 from coverage import env
 from coverage.annotate import AnnotateReporter
diff --git a/coverage/data.py b/coverage/data.py
@@ -16,8 +16,8 @@
 import glob
 import hashlib
 import os.path
-from collections.abc import Iterable
-from typing import Callable, Literal
+from collections.abc import Callable, Iterable
+from typing import Literal
 
 from coverage.exceptions import CoverageException, NoDataError
 from coverage.files import PathAliases
diff --git a/coverage/debug.py b/coverage/debug.py
@@ -19,8 +19,8 @@
 import sys
 import traceback
 import types
-from collections.abc import Iterable, Iterator, Mapping
-from typing import IO, Any, Callable, Final, overload
+from collections.abc import Callable, Iterable, Iterator, Mapping
+from typing import IO, Any, Final, overload
 
 from coverage.misc import human_sorted_items, isolate_module
 from coverage.types import AnyCallable, TWritable
diff --git a/coverage/files.py b/coverage/files.py
@@ -12,8 +12,7 @@
 import posixpath
 import re
 import sys
-from collections.abc import Iterable
-from typing import Callable
+from collections.abc import Callable, Iterable
 
 from coverage import env
 from coverage.exceptions import ConfigError
diff --git a/coverage/parser.py b/coverage/parser.py
@@ -12,10 +12,10 @@
 import re
 import token
 import tokenize
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from dataclasses import dataclass
 from types import CodeType
-from typing import Callable, Optional, Protocol, cast
+from typing import Optional, Protocol, cast
 
 from coverage import env
 from coverage.bytecode import code_objects
diff --git a/coverage/plugin_support.py b/coverage/plugin_support.py
@@ -8,9 +8,9 @@
 import os
 import os.path
 import sys
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from types import FrameType
-from typing import Any, Callable
+from typing import Any
 
 from coverage.exceptions import PluginError
 from coverage.misc import isolate_module
diff --git a/coverage/pytracer.py b/coverage/pytracer.py
@@ -10,8 +10,9 @@
 import itertools
 import sys
 import threading
+from collections.abc import Callable
 from types import FrameType, ModuleType
-from typing import Any, Callable, cast
+from typing import Any, cast
 
 from coverage import env
 from coverage.types import (
diff --git a/coverage/report_core.py b/coverage/report_core.py
@@ -6,8 +6,8 @@
 from __future__ import annotations
 
 import sys
-from collections.abc import Iterable
-from typing import IO, TYPE_CHECKING, Callable, Protocol
+from collections.abc import Callable, Iterable
+from typing import IO, TYPE_CHECKING, Protocol
 
 from coverage.exceptions import NoDataError, NotPython
 from coverage.files import GlobMatcher, prep_patterns
diff --git a/coverage/sqldata.py b/coverage/sqldata.py
@@ -20,8 +20,8 @@
 import threading
 import uuid
 import zlib
-from collections.abc import Collection, Mapping, Sequence
-from typing import Any, Callable, cast
+from collections.abc import Callable, Collection, Mapping, Sequence
+from typing import Any, cast
 
 from coverage.debug import NoDebugging, auto_repr, file_summary
 from coverage.exceptions import CoverageException, DataError
diff --git a/coverage/sysmon.py b/coverage/sysmon.py
@@ -13,9 +13,10 @@
 import sys
 import threading
 import traceback
+from collections.abc import Callable
 from dataclasses import dataclass
 from types import CodeType
-from typing import Any, Callable, NewType, Optional, cast
+from typing import Any, NewType, Optional, cast
 
 from coverage import env
 from coverage.bytecode import TBranchTrails, always_jumps, branch_trails
diff --git a/coverage/templite.py b/coverage/templite.py
@@ -13,7 +13,8 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Callable, NoReturn, cast
+from collections.abc import Callable
+from typing import Any, NoReturn, cast
 
 
 class TempliteSyntaxError(ValueError):
diff --git a/coverage/tomlconfig.py b/coverage/tomlconfig.py
@@ -7,8 +7,8 @@
 
 import os
 import re
-from collections.abc import Iterable
-from typing import Any, Callable, TypeVar
+from collections.abc import Callable, Iterable
+from typing import Any, TypeVar
 
 from coverage import config, env
 from coverage.exceptions import ConfigError
diff --git a/coverage/types.py b/coverage/types.py
@@ -9,9 +9,9 @@
 
 import os
 import pathlib
-from collections.abc import Iterable, Mapping
+from collections.abc import Callable, Iterable, Mapping
 from types import FrameType, ModuleType
-from typing import TYPE_CHECKING, Any, Callable, Optional, Protocol
+from typing import TYPE_CHECKING, Any, Optional, Protocol
 
 if TYPE_CHECKING:
     from coverage.plugin import FileTracer
diff --git a/tests/helpers.py b/tests/helpers.py
@@ -19,9 +19,9 @@
 import textwrap
 import warnings
 
+from collections.abc import Callable, Iterable, Iterator
 from pathlib import Path
-from typing import Any, Callable, NoReturn, TypeVar, cast
-from collections.abc import Iterable, Iterator
+from typing import Any, NoReturn, TypeVar, cast
 
 from coverage import env
 from coverage.debug import DebugControl
diff --git a/tests/mixins.py b/tests/mixins.py
@@ -14,8 +14,8 @@
 import os.path
 import sys
 
-from collections.abc import Iterable
-from typing import Any, Callable, cast
+from collections.abc import Callable, Iterable
+from typing import Any, cast
 
 import pytest
 
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -15,8 +15,8 @@
 import sys
 import textwrap
 
-from typing import cast, Callable
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
+from typing import cast
 
 import pytest
 
diff --git a/tests/test_data.py b/tests/test_data.py
@@ -12,8 +12,8 @@
 import sqlite3
 import threading
 
-from collections.abc import Collection, Iterable, Mapping
-from typing import Any, Callable, TypeVar
+from collections.abc import Callable, Collection, Iterable, Mapping
+from typing import Any, TypeVar
 from unittest import mock
 
 import pytest
diff --git a/tests/test_debug.py b/tests/test_debug.py
@@ -11,8 +11,8 @@
 import re
 import sys
 
-from typing import Any, Callable
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
+from typing import Any
 
 import pytest
 
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
@@ -10,7 +10,8 @@
 import math
 import os.path
 
-from typing import Any, Iterable
+from collections.abc import Iterable
+from typing import Any
 from xml.etree import ElementTree
 
 import pytest
