Add more type checks

asvetlov · asvetlov · commit 822004212800 · 2022-01-24T17:03:54.000+02:00
diff --git a/Makefile b/Makefile
@@ -12,35 +12,36 @@ all: test
 	@touch .install-deps
 
 .flake: .install-deps $(shell find multidict -type f) \
-                      $(shell find tests -type f)
+		      $(shell find tests -type f)
 	flake8 multidict tests
 	@if ! isort --check multidict tests; then \
-            echo "Import sort errors, run 'make fmt' to fix them!!!"; \
-            isort --diff --check multidict tests; \
-            false; \
+	    echo "Import sort errors, run 'make fmt' to fix them!!!"; \
+	    isort --diff --check multidict tests; \
+	    false; \
 	fi
 	@touch .flake
 
 
 isort-check:
 	@if ! isort --check $(SRC); then \
-            echo "Import sort errors, run 'make fmt' to fix them!!!"; \
-            isort --diff --check $(SRC); \
-            false; \
+	    echo "Import sort errors, run 'make fmt' to fix them!!!"; \
+	    isort --diff --check $(SRC); \
+	    false; \
 	fi
 
 flake8:
 	flake8 $(SRC)
 
 black-check:
 	@if ! isort --check $(SRC); then \
-            echo "black errors, run 'make fmt' to fix them!!!"; \
+	    echo "black errors, run 'make fmt' to fix them!!!"; \
 	    black -t py35 --diff --check $(SRC); \
-            false; \
+	    false; \
 	fi
 
 mypy:
 	mypy --show-error-codes multidict tests
+	mypy --show-error-codes tests/test_mypy.py --strict
 
 lint: flake8 black-check mypy isort-check check_changes
 
diff --git a/multidict/__init__.pyi b/multidict/__init__.pyi
@@ -39,7 +39,10 @@ class MultiMapping(Mapping[_S, _T_co]):
     @abc.abstractmethod
     def getone(self, key: _S, default: _D) -> Union[_T_co, _D]: ...
 
-_Arg = Union[Mapping[_S, _T], Dict[_S, _T], MultiMapping[_T], Iterable[Tuple[_S, _T]]]
+_Arg = Union[Mapping[str, _T], Mapping[istr, _T],
+             Dict[str, _T], Dict[istr, _T],
+             MultiMapping[_T],
+             Iterable[Tuple[str, _T]], Iterable[Tuple[istr, _T]]]
 
 class MutableMultiMapping(MultiMapping[_T], MutableMapping[_S, _T], Generic[_T]):
     @abc.abstractmethod
diff --git a/tests/test_version.py b/tests/test_version.py
@@ -17,7 +17,7 @@
 
 
 class VersionMixin:
-    cls: Type[MultiMapping[str, str]]
+    cls: Type[MultiMapping[str]]
 
     def getver(self, md):
         raise NotImplementedError
