Fix broken tests, add new tests, and remove things added for debugging

Author: root

mypy/checker.py

@@ -3024,13 +3024,15 @@ def visit_decorator(self, e: Decorator) -> None:
         self.check_untyped_after_decorator(sig, e.func)
         sig = set_callable_name(sig, e.func)
         if e.func.is_property:
-            assert isinstance(sig, CallableType)
-            sig = sig.ret_type
             self.check_incompatible_property_override(e)
         e.var.type = sig
         e.var.is_ready = True
         if isinstance(sig, CallableType):
-            e.is_callable = True
+            if e.func.is_property:
+                assert isinstance(sig, CallableType)
+                e.is_callable = isinstance(sig.ret_type, CallableType)
+            else:
+                e.is_callable = True
         if e.func.info and not e.func.is_dynamic():
             self.check_method_override(e)
 

mypy/checkmember.py

@@ -77,7 +77,7 @@ def analyze_member_access(name: str,
 
         # Look up the member. First look up the method dictionary.
         method = info.get_method(name)
-        if method:
+        if method and not method.is_class:
             if method.is_property:
                 assert isinstance(method, OverloadedFuncDef)
                 first_item = cast(Decorator, method.items[0])

mypy/errors.py

@@ -594,8 +594,6 @@ def report_internal_error(err: Exception, file: Optional[str], line: int,
         pdb.post_mortem(sys.exc_info()[2])
 
     # If requested, print traceback, else print note explaining how to get one.
-    if options.raise_exceptions:
-        raise err
     if not options.show_traceback:
         if not options.pdb:
             print('{}: note: please use --show-traceback to print a traceback '

mypy/fastparse.py

@@ -871,8 +871,7 @@ def is_star2arg(k: ast3.keyword) -> bool:
             [k.value for k in n.keywords])
         arg_kinds = ([ARG_STAR if isinstance(a, ast3.Starred) else ARG_POS for a in n.args] +
                      [ARG_STAR2 if is_star2arg(k) else ARG_NAMED for k in n.keywords])
-        expr = self.visit(n.func)
-        return CallExpr(expr,
+        return CallExpr(self.visit(n.func),
                         arg_types,
                         arg_kinds,
                         cast(List[Optional[str]], [None] * len(n.args)) +

mypy/main.py

@@ -618,9 +618,6 @@ def add_invertible_flag(flag: str,
     internals_group.add_argument(
         '--show-traceback', '--tb', action='store_true',
         help="Show traceback on fatal error")
-    internals_group.add_argument(
-        '--raise-exceptions', action='store_true', help="Raise exception on fatal error"
-    )
     internals_group.add_argument(
         '--custom-typing', metavar='MODULE', dest='custom_typing_module',
         help="Use a custom typing module")

mypy/options.py

@@ -196,7 +196,6 @@ def __init__(self) -> None:
         self.verbosity = 0  # More verbose messages (for troubleshooting)
         self.pdb = False
         self.show_traceback = False
-        self.raise_exceptions = False
         self.dump_type_stats = False
         self.dump_inference_stats = False
 

mypy/subtypes.py

@@ -572,7 +572,10 @@ def get_member_flags(name: str, info: TypeInfo) -> Set[int]:
             assert isinstance(dec, Decorator)
             if dec.var.is_settable_property or setattr_meth:
                 return {IS_SETTABLE}
-        return set()
+        if method.is_static or method.is_class:
+            return {IS_CLASS_OR_STATIC}
+        else:
+            return set()
     node = info.get(name)
     if not node:
         if setattr_meth:
@@ -604,7 +607,12 @@ def find_node_type(node: Union[Var, FuncBase], itype: Instance, subtype: Type) -
     if typ is None:
         return AnyType(TypeOfAny.from_error)
     # We don't need to bind 'self' for static methods, since there is no 'self'.
-    if isinstance(node, FuncBase) or isinstance(typ, FunctionLike) and not node.is_staticmethod:
+    need_bind = False
+    if isinstance(node, FuncBase):
+        need_bind = not node.is_static
+    elif isinstance(typ, FunctionLike):
+        need_bind = not node.is_staticmethod
+    if need_bind:
         assert isinstance(typ, FunctionLike)
         signature = bind_self(typ, subtype)
         if node.is_property:

mypy_self_check.ini

@@ -8,7 +8,7 @@ disallow_any_generics = True
 disallow_any_unimported = True
 warn_redundant_casts = True
 warn_unused_configs = True
-raise_exceptions = True
+show_traceback = True
 
 # needs py2 compatibility
 [mypy-mypy.test.testextensions]

test-data/unit/check-abstract.test

@@ -749,7 +749,7 @@ class A(metaclass=ABCMeta):
     def x(self) -> int: pass
 class B(A):
     @property
-    def x(self) -> str: pass # E: Signature of "x" incompatible with supertype "A"
+    def x(self) -> str: pass # E: Return type of "x" incompatible with supertype "A"
 b = B()
 b.x() # E: "str" not callable
 [builtins fixtures/property.pyi]

test-data/unit/check-classes.test

@@ -5501,3 +5501,29 @@ from typing import TypeVar, Tuple, Callable
 T = TypeVar('T')
 def deco(f: Callable[..., T]) -> Callable[..., Tuple[T, int]]: ...
 [out]
+
+[case testDecoratedInit]
+from typing import Callable, Any
+def dec(func: Callable[[Any], None]) -> Callable[[Any], None]:
+    return func
+
+class A:
+    @dec
+    def __init__(self):
+        pass
+
+reveal_type(A())  # E: Revealed type is '__main__.A'
+[out]
+
+[case testAbstractInit]
+from abc import abstractmethod
+class A:
+    @abstractmethod
+    def __init__(self): ...
+
+class B(A):
+    def __init__(self):
+        pass
+
+reveal_type(B())  # E: Revealed type is '__main__.B'
+[out]