Skip to content

Don't accidentally ignore typeguard validity for staticmethods #14953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 26, 2023
Merged

Don't accidentally ignore typeguard validity for staticmethods #14953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bd99419
Fix a slip up I made
A5rocks Mar 24, 2023
9aa5b40
Appease black (?)
A5rocks Mar 24, 2023
96182d2
Appease flake8
A5rocks Mar 24, 2023
e019308
Appease black one more time...
A5rocks Mar 24, 2023
964a6e9
Add a forgotten fixture
A5rocks Mar 24, 2023
a5c48e4
Move error message in test?
A5rocks Mar 24, 2023
b9ee101
Maybe fix the test for good
A5rocks Mar 25, 2023
96fadf7
Update test-data/unit/check-typeguard.test
A5rocks Mar 25, 2023
9270eab
Update test-data/unit/check-typeguard.test
hauntsaninja Mar 25, 2023
93c95f0
Remove some unnecessary fixtures
A5rocks Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,11 +867,8 @@ def analyze_func_def(self, defn: FuncDef) -> None:
assert isinstance(result, ProperType)
if isinstance(result, CallableType):
# type guards need to have a positional argument, to spec
if (
result.type_guard
and ARG_POS not in result.arg_kinds[self.is_class_scope() :]
and not defn.is_static
):
skip_self = self.is_class_scope() and not defn.is_static
if result.type_guard and ARG_POS not in result.arg_kinds[skip_self:]:
self.fail(
"TypeGuard functions must have a positional argument",
result,
Expand Down
25 changes: 21 additions & 4 deletions test-data/unit/check-typeguard.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,12 +602,30 @@ def func(names: Tuple[str, ...]):
from typing_extensions import TypeGuard

class Z:
def typeguard(self, *, x: object) -> TypeGuard[int]: # E: TypeGuard functions must have a positional argument
def typeguard1(self, *, x: object) -> TypeGuard[int]: # line 4
...

@staticmethod
def typeguard2(x: object) -> TypeGuard[int]:
...

@staticmethod # line 11
def typeguard3(*, x: object) -> TypeGuard[int]:
...

def bad_typeguard(*, x: object) -> TypeGuard[int]: # E: TypeGuard functions must have a positional argument
def bad_typeguard(*, x: object) -> TypeGuard[int]: # line 15
...
[builtins fixtures/tuple.pyi]

# In Python 3.8 the line number associated with FunctionDef nodes changed
[builtins fixtures/classmethod.pyi]
[out]
main:4: error: TypeGuard functions must have a positional argument
main:11: error: TypeGuard functions must have a positional argument
main:15: error: TypeGuard functions must have a positional argument
[out version>=3.8]
main:4: error: TypeGuard functions must have a positional argument
main:12: error: TypeGuard functions must have a positional argument
main:15: error: TypeGuard functions must have a positional argument

[case testTypeGuardWithKeywordArg]
from typing_extensions import TypeGuard
Expand Down Expand Up @@ -640,7 +658,6 @@ if Y().typeguard(x):
reveal_type(x) # N: Revealed type is "builtins.int"
if Y.typeguard(x):
reveal_type(x) # N: Revealed type is "builtins.int"
[builtins fixtures/tuple.pyi]
[builtins fixtures/classmethod.pyi]

[case testTypeGuardKwargFollowingThroughOverloaded]
Expand Down