[3.6] add more types to LooseCookies #4205 (#4218) (#4222)

* add more types to LooseCookies #4205 * predefine the Union types for LooseCookies * add CHANGES fragment (cherry picked from commit e048934) Co-authored-by: Adam Bannister <adam.p.bannister@gmail.com>
aio-libs · Oct 18, 2019 · d51badb · d51badb
1 parent 011ca1f
commit d51badb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/CHANGES/4218.misc b/CHANGES/4218.misc
@@ -0,0 +1 @@
+Add two more types to LooseCookies.
diff --git a/aiohttp/cookiejar.py b/aiohttp/cookiejar.py
@@ -125,7 +125,7 @@ def update_cookies(self,
             return
 
         if isinstance(cookies, Mapping):
-            cookies = cookies.items()  # type: ignore
+            cookies = cookies.items()
 
         for name, cookie in cookies:
             if not isinstance(cookie, Morsel):

diff --git a/aiohttp/typedefs.py b/aiohttp/typedefs.py
@@ -29,7 +29,7 @@
     _CIMultiDictProxy = CIMultiDictProxy[str]
     _MultiDict = MultiDict[str]
     _MultiDictProxy = MultiDictProxy[str]
-    from http.cookies import BaseCookie  # noqa
+    from http.cookies import BaseCookie, Morsel  # noqa
 else:
     _CIMultiDict = CIMultiDict
     _CIMultiDictProxy = CIMultiDictProxy
@@ -43,8 +43,18 @@
                      _CIMultiDictProxy]
 RawHeaders = Tuple[Tuple[bytes, bytes], ...]
 StrOrURL = Union[str, URL]
-LooseCookies = Union[Iterable[Tuple[str, 'BaseCookie[str]']],
-                     Mapping[str, 'BaseCookie[str]'], 'BaseCookie[str]']
+
+StrBaseCookieTuples = Iterable[Tuple[str, 'BaseCookie[str]']]
+StrMorselTuples = Iterable[Tuple[str, 'Morsel[str]']]
+StrToBaseCookieMapping = Mapping[str, 'BaseCookie[str]']
+StrToMorselMapping = Mapping[str, 'Morsel[Any]']
+LooseCookies = Union[
+    StrBaseCookieTuples,
+    StrMorselTuples,
+    StrToBaseCookieMapping,
+    StrToMorselMapping,
+    'BaseCookie[str]',
+]
 
 
 if sys.version_info >= (3, 6):