From f08d769f7c583f1a2176c65160f0826523d4e622 Mon Sep 17 00:00:00 2001
From: Stephen Morton <git@tungol.org>
Date: Tue, 15 Oct 2024 10:47:56 -0700
Subject: [PATCH] remove unneeded Iterable base class from CookieJar (#12812)

---
 stdlib/http/cookiejar.pyi           | 4 ++--
 stubs/requests/requests/cookies.pyi | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stdlib/http/cookiejar.pyi b/stdlib/http/cookiejar.pyi
index 56097f163..31e1d3fc8 100644
--- a/stdlib/http/cookiejar.pyi
+++ b/stdlib/http/cookiejar.pyi
@@ -1,6 +1,6 @@
 import sys
 from _typeshed import StrPath
-from collections.abc import Iterable, Iterator, Sequence
+from collections.abc import Iterator, Sequence
 from http.client import HTTPResponse
 from re import Pattern
 from typing import ClassVar, TypeVar, overload
@@ -21,7 +21,7 @@ _T = TypeVar("_T")
 
 class LoadError(OSError): ...
 
-class CookieJar(Iterable[Cookie]):
+class CookieJar:
     non_word_re: ClassVar[Pattern[str]]  # undocumented
     quote_re: ClassVar[Pattern[str]]  # undocumented
     strict_domain_re: ClassVar[Pattern[str]]  # undocumented
diff --git a/stubs/requests/requests/cookies.pyi b/stubs/requests/requests/cookies.pyi
index 65f57e11c..dc0138d89 100644
--- a/stubs/requests/requests/cookies.pyi
+++ b/stubs/requests/requests/cookies.pyi
@@ -35,7 +35,7 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None): ...
 
 class CookieConflictError(RuntimeError): ...
 
-class RequestsCookieJar(CookieJar, MutableMapping[str, str]):  # pyright: ignore[reportGeneralTypeIssues]
+class RequestsCookieJar(CookieJar, MutableMapping[str, str]):  # type: ignore[misc] # conflicting __iter__ in the base classes
     def get(self, name: str, default: str | None = None, domain: str | None = None, path: str | None = None) -> str | None: ...  # type: ignore[override]
     def set(self, name: str, value: str | Morsel[dict[str, str]], **kwargs) -> Cookie | None: ...
     def iterkeys(self) -> Iterator[str]: ...