[PR #11088/b1da65e1 backport][3.12] Remove ABC names for isinstance checks (#11089)

Author: patchback[bot]

CHANGES/11088.misc.rst

@@ -0,0 +1 @@
+11085.misc.rst

aiohttp/client_reqrep.py

@@ -7,7 +7,7 @@
 import sys
 import traceback
 import warnings
-from collections.abc import Mapping as ABCMapping
+from collections.abc import Mapping
 from hashlib import md5, sha1, sha256
 from http.cookies import CookieError, Morsel, SimpleCookie
 from types import MappingProxyType, TracebackType
@@ -1085,7 +1085,7 @@ def update_cookies(self, cookies: Optional[LooseCookies]) -> None:
             c.load(self.headers.get(hdrs.COOKIE, ""))
             del self.headers[hdrs.COOKIE]
 
-        if isinstance(cookies, ABCMapping):
+        if isinstance(cookies, Mapping):
             iter_cookies = cookies.items()
         else:
             iter_cookies = cookies  # type: ignore[assignment]

aiohttp/cookiejar.py

@@ -11,7 +11,7 @@
 import time
 import warnings
 from collections import defaultdict
-from collections.abc import Mapping as ABCMapping
+from collections.abc import Mapping
 from http.cookies import BaseCookie, Morsel, SimpleCookie
 from typing import (
     DefaultDict,
@@ -236,7 +236,7 @@ def update_cookies(self, cookies: LooseCookies, response_url: URL = URL()) -> No
             # Don't accept cookies from IPs
             return
 
-        if isinstance(cookies, ABCMapping):
+        if isinstance(cookies, Mapping):
             cookies = cookies.items()
 
         for name, cookie in cookies:

aiohttp/multipart.py

@@ -6,7 +6,7 @@
 import uuid
 import warnings
 from collections import deque
-from collections.abc import Mapping as ABCMapping, Sequence as ABCSequence
+from collections.abc import Mapping, Sequence
 from types import TracebackType
 from typing import (
     TYPE_CHECKING,
@@ -15,9 +15,7 @@
     Dict,
     Iterator,
     List,
-    Mapping,
     Optional,
-    Sequence,
     Tuple,
     Type,
     Union,
@@ -954,12 +952,12 @@ def append_form(
         headers: Optional[Mapping[str, str]] = None,
     ) -> Payload:
         """Helper to append form urlencoded part."""
-        assert isinstance(obj, (ABCSequence, ABCMapping))
+        assert isinstance(obj, (Sequence, Mapping))
 
         if headers is None:
             headers = CIMultiDict()
 
-        if isinstance(obj, ABCMapping):
+        if isinstance(obj, Mapping):
             obj = list(obj.items())
         data = urlencode(obj, doseq=True)
 

aiohttp/payload.py

@@ -7,15 +7,14 @@
 import sys
 import warnings
 from abc import ABC, abstractmethod
-from collections.abc import Iterable as ABCIterable
+from collections.abc import Iterable
 from itertools import chain
 from typing import (
     IO,
     TYPE_CHECKING,
     Any,
     Dict,
     Final,
-    Iterable,
     List,
     Optional,
     Set,
@@ -138,7 +137,7 @@ def register(
             self._first.append((factory, type))
         elif order is Order.normal:
             self._normal.append((factory, type))
-            if isinstance(type, ABCIterable):
+            if isinstance(type, Iterable):
                 for t in type:
                     self._normal_lookup[t] = factory
             else: