Fix untyped decorator check for class instances #5509
Conversation
mypy/checker.py
Outdated
| method = typ.type.get_method('__call__') | ||
| if method and method.type: | ||
| return not is_typed_callable(method.type) | ||
| return True |
There was a problem hiding this comment.
If an Instance doesn't have a __call__ method this will return True, which will generate an additional spurious error. While I believe it shouldn't.
Could you please add a test case for this?
mypy/checker.py
Outdated
| return typ.implicit | ||
| if isinstance(typ, CallableType): | ||
| return typ.implicit | ||
| if isinstance(typ, Instance): |
There was a problem hiding this comment.
if -> elif would be better here.
mypy/checker.py
Outdated
| if isinstance(typ, Instance): | ||
| method = typ.type.get_method('__call__') | ||
| if method and method.type: | ||
| return not is_typed_callable(method.type) |
There was a problem hiding this comment.
This seems a bit inconsistent with the above. I would either use typ.implicit in both branches, or is_typed_callable in both branches.
test-data/unit/check-flags.test
Outdated
|
|
||
| @UntypedDecorator() # E: Untyped decorator makes function "f" untyped | ||
| @TypedDecorator() | ||
| def f() -> None: pass |
There was a problem hiding this comment.
Could you please add four separate checks that would check only first decorator, only second decorator, and both of them in different order. Each check should also have a reveal_type for the function so that it is clear the behaviour is correct.
|
Thank you for the review. Updated with requested fixes + fix for the |
… overloads (#9232) When --disallow-untyped-decorators is used, a callable-class decorator with a overloads on its __call__ implementation would incorrectly issue an "Untyped decorator makes function untyped" error, even when the overloads are typed properly. This has been reported in pytest, which does this: pytest-dev/pytest#7589. This fixes the problem by expanding on a previous fix in this area, #5509.
Running
mypy --disallow-untyped-decoratorswhen the decorator is a typed callable instance produces an error even thoughreveal_typeshows the correct type.Related to #4191 but I'll leave that one for a different PR.