Fix lint and remaining fixture

python · ilevkivskyi · Feb 15, 2019 · Feb 10, 2019 · Feb 10, 2019 · Feb 10, 2019
commit 400ac32eca8a8753790edc8e1a3d6d826cfb1b5d
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -3010,10 +3010,10 @@ def analyze_container_item_type(self, typ: Type) -> Optional[Type]:
                     types.append(c_type)
             return UnionType.make_union(types)
         if isinstance(typ, Instance) and typ.type.has_base('typing.Container'):
-                supertype = self.named_type('typing.Container').type
-                super_instance = map_instance_to_supertype(typ, supertype)
-                assert len(super_instance.args) == 1
-                return super_instance.args[0]
+            supertype = self.named_type('typing.Container').type
+            super_instance = map_instance_to_supertype(typ, supertype)
+            assert len(super_instance.args) == 1
+            return super_instance.args[0]
         return None
 
     def analyze_index_variables(self, index: Expression, item_type: Type,

diff --git a/test-data/unit/check-expressions.test b/test-data/unit/check-expressions.test
@@ -490,7 +490,7 @@ class A:
     def __cmp__(self, o):
       # type: ('B') -> bool
       pass
-    def __eq__(self, o):  # type: ignore
+    def __eq__(self, o):
       # type: ('int') -> bool
       pass
 class B:
@@ -504,7 +504,7 @@ class C:
     def __cmp__(self, o):
       # type: ('A') -> bool
       pass
-    def __eq__(self, o):  # type: ignore
+    def __eq__(self, o):
       # type: ('int') -> bool
       pass
 
@@ -2079,12 +2079,10 @@ A() == B()  # E: Unsupported operand types for == ("A" and "B")
 
 [case testCustomContainsCheckStrictEquality]
 # flags: --strict-equality
-from typing import Container
 class A:
-    def __contains__(self, other: A) -> bool:  # type: ignore
+    def __contains__(self, other: A) -> bool:
         ...
 
 # Don't report non-overlapping check if there is already and error.
 42 in A()  # E: Unsupported operand types for in ("int" and "A")
 [builtins fixtures/bool.pyi]
-[typing fixtures/typing-full.pyi]
diff --git a/test-data/unit/fixtures/bool.pyi b/test-data/unit/fixtures/bool.pyi
@@ -1,11 +1,13 @@
 # builtins stub used in boolean-related test cases.
 from typing import Generic, TypeVar
+import sys
 T = TypeVar('T')
 
 class object:
     def __init__(self) -> None: pass
-    def __eq__(self, other: object) -> bool: pass
-    def __ne__(self, other: object) -> bool: pass
+    if sys.version_info[0] >= 3:  # type: ignore
+        def __eq__(self, other: object) -> bool: pass
+        def __ne__(self, other: object) -> bool: pass
 
 class type: pass
 class tuple(Generic[T]): pass