fix type annotations

Author: penguinolog

.travis.yml

@@ -13,9 +13,6 @@ _python:
   python: 3.7
   dist: xenial
   sudo: true
-- &pypy
-  name: "PyPy"
-  python: pypy
 - &pypy3
   name: "PyPy3"
   python: pypy3
@@ -91,8 +88,6 @@ jobs:
 
   - stage: test
     <<: *python37
-  - stage: test
-    <<: *pypy
   - stage: test
     <<: *pypy3
 

README.rst

@@ -36,14 +36,9 @@ Python binfield implementation for binary data manipulation.
 
 ::
 
-    Python 2.7
-    Python 3.4
-    Python 3.5
     Python 3.6
     Python 3.7
-    PyPy
     PyPy3
-    Jyton 2.7
 
 Usage
 =====
@@ -196,11 +191,7 @@ Test environments available:
 ::
 
     pep8
-    py27
-    py34
-    py35
     py36
-    pypy
     pypy3
     pylint
     docs

binfield/binfield.py

@@ -24,8 +24,27 @@
 
 KeyT = typing.Union[str, int, slice, typing.Tuple[int, int], typing.List[int]]
 IndexT = typing.Union[int, slice, typing.Iterable[int], typing.Dict[str, typing.Tuple[int, int]]]
-ResolvedMappingT = typing.Dict[str, typing.Union[slice, int, typing.Dict[str, typing.Any]]]
-AllowedMappingT = typing.Optional[typing.Dict[str, typing.Union[IndexT, typing.Dict[str, typing.Any]]]]
+ResolvedMappingT = typing.Dict[
+    str,
+    typing.Union[int, slice, typing.Dict[str, typing.Any]],
+]
+DeclaredMappingT = typing.Dict[
+    str,
+    typing.Union[int, slice, typing.Tuple[int, int], typing.List[int], typing.Dict[str, typing.Any]],
+]
+
+AllowedMappingT = typing.Optional[DeclaredMappingT]
+
+# Resolve mapping
+# _size_ : int -> _size_ + _mask_
+# _mask_ : int -> _mask_ + _size_
+# _index_ -> only for nested structures
+#
+# Values
+# slice -> slice
+# tuple(int, int) -> slice
+# list(int, int) -> slice
+# int -> int
 
 
 def _is_descriptor(obj: typing.Any) -> bool:
@@ -134,7 +153,7 @@ def _get_start_index(src: typing.Tuple[typing.Any, IndexT]) -> int:
     return _get_index(src[1]).start  # type: ignore
 
 
-def _prepare_mapping(mapping: typing.Dict[str, typing.Union[IndexT, typing.Dict[str, typing.Any]]]) -> ResolvedMappingT:
+def _prepare_mapping(mapping: DeclaredMappingT) -> ResolvedMappingT:
     """Check indexes for intersections.
 
     :type mapping: typing.Dict
@@ -291,7 +310,7 @@ def __new__(  # type: ignore
             # Top level baseclass: cleanup
             for key in "_value_", "_size_", "_mask_", "_mapping_":  # pragma: no cover
                 classdict.pop(key, None)
-            return super(BinFieldMeta, mcs).__new__(mcs, name, bases, classdict)
+            return super().__new__(mcs, name, bases, classdict)
 
         meta_dict = {}
         meta_name = f"{name}Meta"
@@ -393,7 +412,7 @@ def __new__(
 
                 sns["__slots__"] = ()  # No any new fields on instances
 
-                return super(SubMeta, smcs).__new__(smcs, sname, sbases, sns)  # type: ignore
+                return super().__new__(smcs, sname, sbases, sns)  # type: ignore
 
         # pylint: enable=bad-mcs-classmethod-argument
 
@@ -427,9 +446,7 @@ def makecls(
 
 
 # noinspection PyRedeclaration
-BaseBinFieldMeta = type.__new__(  # type: ignore  # noqa: F811
-    BinFieldMeta, "BaseBinFieldMeta", (), {"__slots__": ()}
-)
+BaseBinFieldMeta = type.__new__(BinFieldMeta, "BaseBinFieldMeta", (), {"__slots__": ()})  # type: ignore  # noqa: F811
 
 
 # noinspection PyRedeclaration,PyMissingConstructor
@@ -851,10 +868,10 @@ def __getitem__(self, item: KeyT) -> BinField:
             # Extract slice
             slc = slice(*idx["_index_"])
             # Build new _mapping_ dict
-            mapping = copy.deepcopy(idx)
+            mapping: ResolvedMappingT = copy.deepcopy(idx)
             del mapping["_index_"]
             # Get new val
-            return self._getslice_(slc, mapping=mapping, name=item)
+            return self._getslice_(slc, mapping=mapping, name=item)  # type: ignore
 
         raise IndexError(item)