Run pyupgrade --py39-plus on all files

Author: nicoddemus

src/xdist/_path.py

@@ -1,8 +1,8 @@
+from collections.abc import Iterator
 from itertools import chain
 import os
 from pathlib import Path
 from typing import Callable
-from typing import Iterator
 
 
 def visit_path(

src/xdist/dsession.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from enum import auto
 from enum import Enum
 from queue import Empty
 from queue import Queue
 import sys
 from typing import Any
-from typing import Sequence
 import warnings
 
 import execnet

src/xdist/looponfail.py

@@ -9,12 +9,12 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 import os
 from pathlib import Path
 import sys
 import time
 from typing import Any
-from typing import Sequence
 
 from _pytest._io import TerminalWriter
 import execnet
@@ -158,9 +158,9 @@ def repr_pytest_looponfailinfo(
 
 
 def init_worker_session(
-    channel: "execnet.Channel",  # noqa: UP037
+    channel: execnet.Channel,
     args: list[str],
-    option_dict: dict[str, "Any"],  # noqa: UP037
+    option_dict: dict[str, Any],
 ) -> None:
     import os
     import sys

src/xdist/newhooks.py

@@ -14,9 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 import os
 from typing import Any
-from typing import Sequence
 from typing import TYPE_CHECKING
 
 import execnet

src/xdist/remote.py

@@ -9,16 +9,16 @@
 from __future__ import annotations
 
 import collections
+from collections.abc import Generator
+from collections.abc import Iterable
+from collections.abc import Sequence
 import contextlib
 import enum
 import os
 import sys
 import time
 from typing import Any
-from typing import Generator
-from typing import Iterable
 from typing import Literal
-from typing import Sequence
 from typing import TypedDict
 from typing import Union
 import warnings
@@ -98,7 +98,7 @@ def replace(self, iterable: Iterable[Item]) -> None:
             self._items = collections.deque(iterable)
 
     @contextlib.contextmanager
-    def lock(self) -> Generator[collections.deque[Item], None, None]:
+    def lock(self) -> Generator[collections.deque[Item]]:
         with self._lock:
             try:
                 yield self._items

src/xdist/report.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from difflib import unified_diff
-from typing import Sequence
 
 
 def report_collection_diff(

src/xdist/scheduler/each.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import pytest
 

src/xdist/scheduler/load.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from itertools import cycle
-from typing import Sequence
 
 import pytest
 

src/xdist/scheduler/loadscope.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from collections import OrderedDict
+from collections.abc import Sequence
 from typing import NoReturn
-from typing import Sequence
 
 import pytest
 

src/xdist/scheduler/protocol.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from typing import Protocol
-from typing import Sequence
 
 from xdist.workermanage import WorkerController
 

src/xdist/scheduler/worksteal.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from typing import NamedTuple
-from typing import Sequence
 
 import pytest
 

src/xdist/workermanage.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 import enum
 import fnmatch
 import os
@@ -9,7 +10,6 @@
 from typing import Any
 from typing import Callable
 from typing import Literal
-from typing import Sequence
 from typing import Union
 import uuid
 import warnings

testing/conftest.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Generator
 import shutil
 from typing import Callable
-from typing import Generator
 
 import execnet
 import pytest
@@ -12,7 +12,7 @@
 
 
 @pytest.fixture(autouse=True)
-def _divert_atexit(monkeypatch: pytest.MonkeyPatch) -> Generator[None, None, None]:
+def _divert_atexit(monkeypatch: pytest.MonkeyPatch) -> Generator[None]:
     import atexit
 
     finalizers = []

testing/test_dsession.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from typing import Any
 from typing import cast
-from typing import Sequence
 from typing import TYPE_CHECKING
 
 import execnet

testing/test_remote.py

@@ -7,7 +7,6 @@
 from typing import Any
 from typing import Callable
 from typing import cast
-from typing import Dict
 from typing import Union
 import uuid
 
@@ -90,7 +89,7 @@ def worker(request: pytest.FixtureRequest, pytester: pytest.Pytester) -> WorkerS
 
 class TestWorkerInteractor:
     UnserializerReport = Callable[
-        [Dict[str, Any]], Union[pytest.CollectReport, pytest.TestReport]
+        [dict[str, Any]], Union[pytest.CollectReport, pytest.TestReport]
     ]
 
     @pytest.fixture