[3.6] Type hint istr keys allowed in LooseHeaders (#3976)

(cherry picked from commit ec5aee7) Co-authored-by: Ville Skyttä <ville.skytta@iki.fi>
aio-libs · Aug 15, 2019 · 94d3b99 · 94d3b99
1 parent 9d290a7
commit 94d3b99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES/3976.bugfix b/CHANGES/3976.bugfix
@@ -0,0 +1 @@
+Accept istr keys in LooseHeaders type hints.
diff --git a/aiohttp/typedefs.py b/aiohttp/typedefs.py
@@ -12,7 +12,13 @@
     Union,
 )
 
-from multidict import CIMultiDict, CIMultiDictProxy, MultiDict, MultiDictProxy
+from multidict import (
+    CIMultiDict,
+    CIMultiDictProxy,
+    MultiDict,
+    MultiDictProxy,
+    istr,
+)
 from yarl import URL
 
 DEFAULT_JSON_ENCODER = json.dumps
@@ -33,7 +39,8 @@
 Byteish = Union[bytes, bytearray, memoryview]
 JSONEncoder = Callable[[Any], str]
 JSONDecoder = Callable[[str], Any]
-LooseHeaders = Union[Mapping[str, str], _CIMultiDict, _CIMultiDictProxy]
+LooseHeaders = Union[Mapping[Union[str, istr], str], _CIMultiDict,
+                     _CIMultiDictProxy]
 RawHeaders = Tuple[Tuple[bytes, bytes], ...]
 StrOrURL = Union[str, URL]
 LooseCookies = Union[Iterable[Tuple[str, 'BaseCookie[str]']],