Fix type hints (#220)

* Fix type hints

* Tune mypy errors

Author: asvetlov

Makefile

@@ -26,7 +26,7 @@ rmcache:
 
 mypy: .develop
 	if python -c "import sys; sys.exit(sys.implementation.name != 'cpython')"; then \
-	    mypy multidict tests/test_mypy.py; \
+	    mypy multidict tests; \
 	fi
 
 

multidict/__init__.pyi

@@ -12,24 +12,13 @@ _S = Union[str, istr]
 _T = TypeVar('_T')
 
 
-class MultiDict(MutableMapping[_S, _T]):
-    @overload
-    def __init__(self) -> None: ...
-    @overload
-    def __init__(self, map: Mapping[_S, _T]) -> None: ...
-    @overload
-    def __init__(self, iterable: Iterable[Tuple[_S, _T]]) -> None: ...
-
-    def __getitem__(self, k: _S) -> _T: ...
-    def __setitem__(self, k: _S, v: _T) -> None: ...
-    def __delitem__(self, v: _S) -> None: ...
-    def __iter__(self) -> Iterator[_S]: ...
-    def __len__(self) -> int: ...
-
+class MultiMapping(Mapping[_S, _T]):
     def getall(self, key: _S, default: _T=...) -> List[_T]: ...
     def getone(self, key: _S, default: _T=...) -> _T: ...
 
-    def copy(self) -> MultiDict: ...
+
+class MutableMultiMapping(MultiMapping[_T],
+                          MutableMapping[_S, _T]):
 
     def add(self, key: _S, value: _T) -> None: ...
 
@@ -51,27 +40,61 @@ class MultiDict(MutableMapping[_S, _T]):
     def popall(self, key: _S, default: _T=...) -> List[_T]: ...
 
 
-class CIMultiDict(MultiDict[_T]):
-    def copy(self) -> CIMultiDict[_T]: ...
+class MultiDict(MutableMultiMapping[_T]):
+    @overload
+    def __init__(self) -> None: ...
+    @overload
+    def __init__(self, map: Mapping[_S, _T]) -> None: ...
+    @overload
+    def __init__(self, iterable: Iterable[Tuple[_S, _T]]) -> None: ...
 
+    def copy(self) -> MultiDict[_T]: ...
 
-class MultiDictProxy(Mapping[_S, _T]):
-    def __init__(self, arg: Union[MultiDict[_T], MultiDictProxy[_T]]) -> None: ...
 
     def __getitem__(self, k: _S) -> _T: ...
+    def __setitem__(self, k: _S, v: _T) -> None: ...
+    def __delitem__(self, v: _S) -> None: ...
     def __iter__(self) -> Iterator[_S]: ...
     def __len__(self) -> int: ...
 
-    def getall(self, key: _S, default: _T=...) -> List[_T]: ...
-    def getone(self, key: _S, default: _T=...) -> _T: ...
 
-    def copy(self) -> MultiDictProxy: ...
+class CIMultiDict(MutableMultiMapping[_T]):
+    @overload
+    def __init__(self) -> None: ...
+    @overload
+    def __init__(self, map: Mapping[_S, _T]) -> None: ...
+    @overload
+    def __init__(self, iterable: Iterable[Tuple[_S, _T]]) -> None: ...
+
+    def copy(self) -> CIMultiDict[_T]: ...
+
+    def __getitem__(self, k: _S) -> _T: ...
+    def __setitem__(self, k: _S, v: _T) -> None: ...
+    def __delitem__(self, v: _S) -> None: ...
+    def __iter__(self) -> Iterator[_S]: ...
+    def __len__(self) -> int: ...
+
 
+class MultiDictProxy(MultiMapping[_T]):
+    def __init__(self, arg: Union[MultiMapping[_T],
+                                  MutableMultiMapping[_T]]) -> None: ...
+
+    def copy(self) -> MultiDictProxy[_T]: ...
+
+    def __getitem__(self, k: _S) -> _T: ...
+    def __iter__(self) -> Iterator[_S]: ...
+    def __len__(self) -> int: ...
 
 
-class CIMultiDictProxy(MultiDictProxy[_T]):
+class CIMultiDictProxy(MultiMapping[_T]):
+    def __init__(self, arg: Union[MultiMapping[_T],
+                                  MutableMultiMapping[_T]]) -> None: ...
     def copy(self) -> CIMultiDictProxy[_T]: ...
 
+    def __getitem__(self, k: _S) -> _T: ...
+    def __iter__(self) -> Iterator[_S]: ...
+    def __len__(self) -> int: ...
+
 
 def getversion(md: Union[MultiDict[_T],
                          CIMultiDict[_T],

setup.cfg

@@ -4,3 +4,11 @@ test = pytest
 [metadata]
 license_file = LICENSE
 long_description = file: README.rst
+
+
+[mypy-pytest]
+ignore_missing_imports = true
+
+
+[mypy-multidict._multidict]
+ignore_missing_imports = true

tests/test_istr.py

@@ -11,9 +11,12 @@
 from multidict._multidict_py import istr as _istr  # noqa: E402
 
 
+IMPLEMENTATION = getattr(sys, 'implementation')  # to suppress mypy error
+
+
 class IStrMixin:
 
-    cls = None
+    cls = NotImplemented
 
     def test_ctor(self):
         s = self.cls()
@@ -67,7 +70,7 @@ def _create_strs():
         istr2 = _istr()
         _istr(istr2)
 
-    @pytest.mark.skipif(sys.implementation.name != 'cpython',
+    @pytest.mark.skipif(IMPLEMENTATION.name != 'cpython',
                         reason="PyPy has different GC implementation")
     def test_leak(self):
         gc.collect()

tests/test_version.py

@@ -11,7 +11,7 @@
 
 
 class VersionMixin:
-    cls = None
+    cls = NotImplemented
 
     def getver(self, md):
         raise NotImplementedError