From b1da65e11d003681e0b94585d553ec39f6084af9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 29 May 2025 18:09:05 -0500 Subject: [PATCH] Remove ABC names for isinstance checks (#11088) --- CHANGES/11088.misc.rst | 1 + aiohttp/client_reqrep.py | 4 ++-- aiohttp/cookiejar.py | 4 ++-- aiohttp/multipart.py | 8 +++----- aiohttp/payload.py | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) create mode 120000 CHANGES/11088.misc.rst diff --git a/CHANGES/11088.misc.rst b/CHANGES/11088.misc.rst new file mode 120000 index 00000000000..c9ebf3c31e1 --- /dev/null +++ b/CHANGES/11088.misc.rst @@ -0,0 +1 @@ +11085.misc.rst \ No newline at end of file diff --git a/aiohttp/client_reqrep.py b/aiohttp/client_reqrep.py index de62f94da84..e4e0b8a9903 100644 --- a/aiohttp/client_reqrep.py +++ b/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 @@ -1006,7 +1006,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] diff --git a/aiohttp/cookiejar.py b/aiohttp/cookiejar.py index d337944751f..50ae9b055b0 100644 --- a/aiohttp/cookiejar.py +++ b/aiohttp/cookiejar.py @@ -10,7 +10,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, @@ -237,7 +237,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: diff --git a/aiohttp/multipart.py b/aiohttp/multipart.py index c32eb4eb122..9bd739144fb 100644 --- a/aiohttp/multipart.py +++ b/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, @@ -958,12 +956,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) diff --git a/aiohttp/payload.py b/aiohttp/payload.py index de12c758157..1f83b611567 100644 --- a/aiohttp/payload.py +++ b/aiohttp/payload.py @@ -7,7 +7,7 @@ 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, @@ -15,7 +15,6 @@ 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: