Manual typing fix

import AbstractSet => from collections.abc import Set as AbstractSet
and others

Author: Pierre-Sassoulas

src/_pytest/assertion/util.py

@@ -7,9 +7,9 @@
 from collections.abc import Iterable
 from collections.abc import Mapping
 from collections.abc import Sequence
+from collections.abc import Set as AbstractSet
 import os
 import pprint
-from typing import AbstractSet
 from typing import Any
 from typing import Callable
 from typing import Literal

src/_pytest/config/__init__.py

@@ -31,7 +31,6 @@
 from typing import final
 from typing import IO
 from typing import TextIO
-from typing import Type
 from typing import TYPE_CHECKING
 import warnings
 

src/_pytest/fixtures.py

@@ -11,14 +11,14 @@
 from collections.abc import Mapping
 from collections.abc import MutableMapping
 from collections.abc import Sequence
+from collections.abc import Set as AbstractSet
 import dataclasses
 import functools
 import inspect
 import os
 from pathlib import Path
 import sys
 import types
-from typing import AbstractSet
 from typing import Any
 from typing import Callable
 from typing import cast

src/_pytest/logging.py

@@ -5,6 +5,7 @@
 
 from collections.abc import Generator
 from collections.abc import Mapping
+from collections.abc import Set as AbstractSet
 from contextlib import contextmanager
 from contextlib import nullcontext
 from datetime import datetime
@@ -18,7 +19,6 @@
 from pathlib import Path
 import re
 from types import TracebackType
-from typing import AbstractSet
 from typing import final
 from typing import Generic
 from typing import Literal

src/_pytest/main.py

@@ -6,6 +6,7 @@
 from collections.abc import Iterable
 from collections.abc import Iterator
 from collections.abc import Sequence
+from collections.abc import Set as AbstractSet
 import dataclasses
 import fnmatch
 import functools
@@ -14,7 +15,6 @@
 import os
 from pathlib import Path
 import sys
-from typing import AbstractSet
 from typing import Callable
 from typing import final
 from typing import Literal

src/_pytest/mark/__init__.py

@@ -5,8 +5,8 @@
 import collections
 from collections.abc import Collection
 from collections.abc import Iterable
+from collections.abc import Set as AbstractSet
 import dataclasses
-from typing import AbstractSet
 from typing import Optional
 from typing import TYPE_CHECKING
 

src/_pytest/python_api.py

@@ -5,6 +5,7 @@
 from collections.abc import Mapping
 from collections.abc import Sequence
 from collections.abc import Sized
+from contextlib import AbstractContextManager
 from decimal import Decimal
 import math
 from numbers import Complex
@@ -15,7 +16,6 @@
 from typing import Any
 from typing import Callable
 from typing import cast
-from typing import ContextManager
 from typing import final
 from typing import overload
 from typing import TYPE_CHECKING
@@ -978,7 +978,7 @@ def raises(
 
 
 @final
-class RaisesContext(ContextManager[_pytest._code.ExceptionInfo[E]]):
+class RaisesContext(AbstractContextManager[_pytest._code.ExceptionInfo[E]]):
     def __init__(
         self,
         expected_exception: type[E] | tuple[type[E], ...],