Skip to content

Commit ba26b71

Browse files
cdce8pcdce8p
authored
Handle deferred evaluation of annotations in Python 3.14 (#10381)
1 parent fccbf98 commit ba26b71

14 files changed

+124
-34
lines changed

‎doc/whatsnew/fragments/10149.feature

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Handle deferred evaluation of annotations in Python 3.14.
2+
3+
Closes #10149

‎pylint/checkers/typecheck.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -975,8 +975,15 @@ class TypeChecker(BaseChecker):
975975
def open(self) -> None:
976976
py_version = self.linter.config.py_version
977977
self._py310_plus = py_version >= (3, 10)
978+
self._py314_plus = py_version >= (3, 14)
979+
self._postponed_evaluation_enabled = False
978980
self._mixin_class_rgx = self.linter.config.mixin_class_rgx
979981

982+
def visit_module(self, node: nodes.Module) -> None:
983+
self._postponed_evaluation_enabled = (
984+
self._py314_plus or is_postponed_evaluation_enabled(node)
985+
)
986+
980987
@cached_property
981988
def _compiled_generated_members(self) -> tuple[Pattern[str], ...]:
982989
# do this lazily since config not fully initialized in __init__
@@ -1065,7 +1072,7 @@ def visit_attribute(
10651072
):
10661073
return
10671074

1068-
if is_postponed_evaluation_enabled(node) and is_node_in_type_annotation_context(
1075+
if self._postponed_evaluation_enabled and is_node_in_type_annotation_context(
10691076
node
10701077
):
10711078
return
@@ -1949,9 +1956,10 @@ def _detect_unsupported_alternative_union_syntax(self, node: nodes.BinOp) -> Non
19491956
if self._py310_plus: # 310+ supports the new syntax
19501957
return
19511958

1952-
if isinstance(
1953-
node.parent, TYPE_ANNOTATION_NODES_TYPES
1954-
) and not is_postponed_evaluation_enabled(node):
1959+
if (
1960+
isinstance(node.parent, TYPE_ANNOTATION_NODES_TYPES)
1961+
and not self._postponed_evaluation_enabled
1962+
):
19551963
# Use in type annotations only allowed if
19561964
# postponed evaluation is enabled.
19571965
self._check_unsupported_alternative_union_syntax(node)
@@ -1973,7 +1981,7 @@ def _detect_unsupported_alternative_union_syntax(self, node: nodes.BinOp) -> Non
19731981
# Make sure to filter context if postponed evaluation is enabled
19741982
# and parent is allowed node type.
19751983
allowed_nested_syntax = False
1976-
if is_postponed_evaluation_enabled(node):
1984+
if self._postponed_evaluation_enabled:
19771985
parent_node = node.parent
19781986
while True:
19791987
if isinstance(parent_node, TYPE_ANNOTATION_NODES_TYPES):

‎pylint/checkers/variables.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,10 @@ def __init__(self, linter: PyLinter) -> None:
13121312
] = {}
13131313
self._postponed_evaluation_enabled = False
13141314

1315+
def open(self) -> None:
1316+
py_version = self.linter.config.py_version
1317+
self._py314_plus = py_version >= (3, 14)
1318+
13151319
@utils.only_required_for_messages(
13161320
"unbalanced-dict-unpacking",
13171321
)
@@ -1375,7 +1379,9 @@ def visit_module(self, node: nodes.Module) -> None:
13751379
checks globals doesn't overrides builtins.
13761380
"""
13771381
self._to_consume = [NamesConsumer(node, "module")]
1378-
self._postponed_evaluation_enabled = is_postponed_evaluation_enabled(node)
1382+
self._postponed_evaluation_enabled = (
1383+
self._py314_plus or is_postponed_evaluation_enabled(node)
1384+
)
13791385

13801386
for name, stmts in node.locals.items():
13811387
if utils.is_builtin(name):
@@ -2501,8 +2507,8 @@ def _is_only_type_assignment(
25012507
parent = parent_scope.parent
25022508
return True
25032509

2504-
@staticmethod
25052510
def _is_first_level_self_reference(
2511+
self,
25062512
node: nodes.Name,
25072513
defstmt: nodes.ClassDef,
25082514
found_nodes: list[nodes.NodeNG],
@@ -2514,7 +2520,7 @@ def _is_first_level_self_reference(
25142520
# Check if used as type annotation
25152521
# Break if postponed evaluation is enabled
25162522
if utils.is_node_in_type_annotation_context(node):
2517-
if not utils.is_postponed_evaluation_enabled(node):
2523+
if not self._postponed_evaluation_enabled:
25182524
return (VariableVisitConsumerAction.CONTINUE, None)
25192525
return (VariableVisitConsumerAction.RETURN, None)
25202526
# Check if used as default value by calling the class

‎pylint/extensions/typing.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ def open(self) -> None:
186186
self._py39_plus = py_version >= (3, 9)
187187
self._py310_plus = py_version >= (3, 10)
188188
self._py313_plus = py_version >= (3, 13)
189+
self._py314_plus = py_version >= (3, 14)
190+
self._postponed_evaluation_enabled = False
189191

190192
self._should_check_typing_alias = self._py39_plus or (
191193
self._py37_plus and self.linter.config.runtime_typing is False
@@ -197,6 +199,11 @@ def open(self) -> None:
197199
self._should_check_noreturn = py_version < (3, 7, 2)
198200
self._should_check_callable = py_version < (3, 9, 2)
199201

202+
def visit_module(self, node: nodes.Module) -> None:
203+
self._postponed_evaluation_enabled = (
204+
self._py314_plus or is_postponed_evaluation_enabled(node)
205+
)
206+
200207
def _msg_postponed_eval_hint(self, node: nodes.NodeNG) -> str:
201208
"""Message hint if postponed evaluation isn't enabled."""
202209
if self._py310_plus or "annotations" in node.root().future_imports:
@@ -474,7 +481,7 @@ def _check_broken_noreturn(self, node: nodes.Name | nodes.Attribute) -> None:
474481
return
475482

476483
if in_type_checking_block(node) or (
477-
is_postponed_evaluation_enabled(node)
484+
self._postponed_evaluation_enabled
478485
and is_node_in_type_annotation_context(node)
479486
):
480487
return
@@ -511,7 +518,7 @@ def _check_broken_callable(self, node: nodes.Name | nodes.Attribute) -> None:
511518
def _broken_callable_location(self, node: nodes.Name | nodes.Attribute) -> bool:
512519
"""Check if node would be a broken location for collections.abc.Callable."""
513520
if in_type_checking_block(node) or (
514-
is_postponed_evaluation_enabled(node)
521+
self._postponed_evaluation_enabled
515522
and is_node_in_type_annotation_context(node)
516523
):
517524
return False

‎tests/functional/p/postponed/postponed_evaluation_not_activated.314.txt

Whitespace-only changes.

‎tests/functional/p/postponed/postponed_evaluation_not_activated.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
class Class:
55
@classmethod
6-
def from_string(cls, source) -> Class: # [undefined-variable]
6+
def from_string(cls, source) -> Class: # <3.14:[undefined-variable]
77
...
88

9-
def validate_b(self, obj: OtherClass) -> bool: # [used-before-assignment]
9+
def validate_b(self, obj: OtherClass) -> bool: # <3.14:[used-before-assignment]
1010
...
1111

1212

‎tests/functional/u/undefined/undefined_variable.314.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
undefined-variable:12:19:12:26::Undefined variable 'unknown':UNDEFINED
2+
undefined-variable:18:10:18:21:in_method:Undefined variable 'nomoreknown':UNDEFINED
3+
undefined-variable:21:19:21:31::Undefined variable '__revision__':UNDEFINED
4+
undefined-variable:23:8:23:20::Undefined variable '__revision__':UNDEFINED
5+
undefined-variable:27:29:27:37:bad_default:Undefined variable 'unknown2':UNDEFINED
6+
undefined-variable:30:10:30:14:bad_default:Undefined variable 'xxxx':UNDEFINED
7+
undefined-variable:31:4:31:10:bad_default:Undefined variable 'augvar':UNDEFINED
8+
undefined-variable:32:8:32:14:bad_default:Undefined variable 'vardel':UNDEFINED
9+
undefined-variable:34:19:34:31:<lambda>:Undefined variable 'doesnotexist':UNDEFINED
10+
undefined-variable:35:23:35:24:<lambda>:Undefined variable 'z':UNDEFINED
11+
used-before-assignment:38:4:38:9::Using variable 'POUET' before assignment:CONTROL_FLOW
12+
used-before-assignment:43:4:43:10::Using variable 'POUETT' before assignment:CONTROL_FLOW
13+
used-before-assignment:48:4:48:11::Using variable 'POUETTT' before assignment:CONTROL_FLOW
14+
used-before-assignment:56:4:56:9::Using variable 'PLOUF' before assignment:CONTROL_FLOW
15+
used-before-assignment:65:11:65:14:if_branch_test:Using variable 'xxx' before assignment:HIGH
16+
used-before-assignment:91:23:91:32:test_arguments:Using variable 'TestClass' before assignment:HIGH
17+
used-before-assignment:95:16:95:24:TestClass:Using variable 'Ancestor' before assignment:HIGH
18+
used-before-assignment:98:26:98:35:TestClass.MissingAncestor:Using variable 'Ancestor1' before assignment:HIGH
19+
used-before-assignment:105:36:105:41:TestClass.test1.UsingBeforeDefinition:Using variable 'Empty' before assignment:HIGH
20+
undefined-variable:119:10:119:14:Self:Undefined variable 'Self':UNDEFINED
21+
undefined-variable:135:7:135:10::Undefined variable 'BAT':UNDEFINED
22+
undefined-variable:136:4:136:7::Undefined variable 'BAT':UNDEFINED
23+
used-before-assignment:146:31:146:38:KeywordArgument.test1:Using variable 'enabled' before assignment:HIGH
24+
undefined-variable:149:32:149:40:KeywordArgument.test2:Undefined variable 'disabled':UNDEFINED
25+
undefined-variable:154:22:154:25:KeywordArgument.<lambda>:Undefined variable 'arg':UNDEFINED
26+
undefined-variable:166:4:166:13::Undefined variable 'unicode_2':UNDEFINED
27+
undefined-variable:171:4:171:13::Undefined variable 'unicode_3':UNDEFINED
28+
undefined-variable:226:25:226:37:LambdaClass4.<lambda>:Undefined variable 'LambdaClass4':UNDEFINED
29+
undefined-variable:234:25:234:37:LambdaClass5.<lambda>:Undefined variable 'LambdaClass5':UNDEFINED
30+
undefined-variable:291:18:291:24:not_using_loop_variable_accordingly:Undefined variable 'iteree':UNDEFINED
31+
undefined-variable:308:27:308:28:undefined_annotation:Undefined variable 'x':UNDEFINED
32+
used-before-assignment:309:7:309:8:undefined_annotation:Using variable 'x' before assignment:HIGH
33+
undefined-variable:339:11:339:12:decorated3:Undefined variable 'x':UNDEFINED
34+
undefined-variable:344:19:344:20:decorated4:Undefined variable 'y':UNDEFINED
35+
undefined-variable:365:10:365:20:global_var_mixed_assignment:Undefined variable 'GLOBAL_VAR':HIGH

‎tests/functional/u/undefined/undefined_variable.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ def onclick(event):
252252
from datetime import datetime
253253

254254

255-
def func_should_fail(_dt: datetime): # [used-before-assignment]
255+
def func_should_fail(_dt: datetime): # <3.14:[used-before-assignment]
256256
pass
257257

258258

@@ -374,13 +374,13 @@ def global_var_mixed_assignment():
374374

375375

376376
class RepeatedReturnAnnotations:
377-
def x(self, o: RepeatedReturnAnnotations) -> bool: # [undefined-variable]
377+
def x(self, o: RepeatedReturnAnnotations) -> bool: # <3.14:[undefined-variable]
378378
pass
379-
def y(self) -> RepeatedReturnAnnotations: # [undefined-variable]
379+
def y(self) -> RepeatedReturnAnnotations: # <3.14:[undefined-variable]
380380
pass
381-
def z(self) -> RepeatedReturnAnnotations: # [undefined-variable]
381+
def z(self) -> RepeatedReturnAnnotations: # <3.14:[undefined-variable]
382382
pass
383383

384384
class A:
385-
def say_hello(self) -> __module__: # [undefined-variable]
385+
def say_hello(self) -> __module__: # <3.14:[undefined-variable]
386386
...

‎tests/functional/u/undefined/undefined_variable_py30.314.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
undefined-variable:33:34:33:39:Undefined1.InnerScope.test_undefined:Undefined variable 'Undef':UNDEFINED
2+
undefined-variable:36:25:36:28:Undefined1.InnerScope.test1:Undefined variable 'ABC':UNDEFINED
3+
undefined-variable:51:28:51:32:FalsePositive342.test_bad:Undefined variable 'trop':UNDEFINED
4+
undefined-variable:54:31:54:36:FalsePositive342.test_bad1:Undefined variable 'trop1':UNDEFINED
5+
undefined-variable:57:31:57:36:FalsePositive342.test_bad2:Undefined variable 'trop2':UNDEFINED
6+
undefined-variable:63:0:63:9:Bad:Undefined variable 'ABCMet':UNDEFINED
7+
undefined-variable:66:0:66:15:SecondBad:Undefined variable 'ab':UNDEFINED
8+
undefined-variable:97:53:97:61:InheritingClass:Undefined variable 'variable':UNDEFINED
9+
undefined-variable:103:0:103:15:Inheritor:Undefined variable 'DefinedTooLate':UNDEFINED

‎tests/functional/u/undefined/undefined_variable_py30.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class Undefined:
66
""" test various annotation problems. """
77

8-
def test(self)->Undefined: # [undefined-variable]
8+
def test(self)->Undefined: # <3.14:[undefined-variable]
99
""" used Undefined, which is Undefined in this scope. """
1010

1111
Undefined = True

0 commit comments

Comments
 (0)