Skip to content

New semantic analyzer: Enable namedtuple tests and fix self-check error #6452

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 5 commits into from
Feb 21, 2019
Merged

New semantic analyzer: Enable namedtuple tests and fix self-check error #6452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5ff090
Enable namedtuple tests and fix self-check error
ilevkivskyi Feb 20, 2019
9c96304
Update tests
ilevkivskyi Feb 20, 2019
bddf9d8
Fix test
ilevkivskyi Feb 20, 2019
ca8ced4
Merge remote-tracking branch 'upstream/master' into fix-cls-named-tuple
ilevkivskyi Feb 21, 2019
b54c548
Update comment
ilevkivskyi Feb 21, 2019
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
10 changes: 10 additions & 0 deletions mypy/newsemanal/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,16 @@ def analyze_namedtuple_assign(self, s: AssignmentStmt) -> bool:
# Yes, it's a valid namedtuple, but defer if it is not ready.
if not info:
self.mark_incomplete(name, lvalue, becomes_typeinfo=True)
else:
# TODO: This is needed for one-to-one compatibility with old analyzer, otherwise
# type checker will try to infer Any for the l.h.s. causing named tuple class
# object to have type Any when it appears in runtime context.
# Remove this and update the checker after new analyzer is the default one!
# See also #6458.
lvalue.fullname = self.qualified_name(name)
lvalue.is_inferred_def = True
lvalue.kind = kind = self.current_symbol_kind()
lvalue.node = self.make_name_lvalue_var(lvalue, kind, inferred=True)
return True

def analyze_typeddict_assign(self, s: AssignmentStmt) -> bool:
Expand Down
4 changes: 2 additions & 2 deletions mypy/newsemanal/semanal_namedtuple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,9 @@ def add_method(funcname: str,
is_new: bool = False,
) -> None:
if is_classmethod or is_new:
first = [Argument(Var('cls'), TypeType.make_normalized(selftype), None, ARG_POS)]
first = [Argument(Var('_cls'), TypeType.make_normalized(selftype), None, ARG_POS)]
else:
first = [Argument(Var('self'), selftype, None, ARG_POS)]
first = [Argument(Var('_self'), selftype, None, ARG_POS)]
args = first + args

types = [arg.type_annotation for arg in args]
Expand Down
2 changes: 0 additions & 2 deletions mypy/test/hacks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
'check-callable.test',
'check-classes.test',
'check-classvar.test',
'check-class-namedtuple.test',
'check-custom-plugin.test',
'check-dataclasses.test',
'check-default-plugin.test',
Expand All @@ -28,7 +27,6 @@
'check-literal.test',
'check-modules.test',
'check-multiple-inheritance.test',
'check-namedtuple.test',
'check-newtype.test',
'check-optional.test',
'check-overloading.test',
Expand Down
8 changes: 5 additions & 3 deletions test-data/unit/check-class-namedtuple.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,9 @@ reveal_type(takes_base(Base(1))) # E: Revealed type is 'builtins.int'
reveal_type(takes_base(Child(1))) # E: Revealed type is 'builtins.int'
[builtins fixtures/tuple.pyi]

-- Depends on collecting functions via AST, not symbol tables.
[case testNewNamedTupleIllegalNames]
# flags: --no-new-semantic-analyzer
from typing import Callable, NamedTuple

class XMethBad(NamedTuple):
Expand All @@ -612,16 +614,16 @@ class AnnotationsAsAMethod(NamedTuple):

class ReuseNames(NamedTuple):
x: int
def x(self) -> str: # E: Name 'x' already defined on line 22
def x(self) -> str: # E: Name 'x' already defined on line 23
return ''

def y(self) -> int:
return 0
y: str # E: Name 'y' already defined on line 26
y: str # E: Name 'y' already defined on line 27

class ReuseCallableNamed(NamedTuple):
z: Callable[[ReuseNames], int]
def z(self) -> int: # E: Name 'z' already defined on line 31
def z(self) -> int: # E: Name 'z' already defined on line 32
return 0

[builtins fixtures/dict.pyi]
Expand Down
34 changes: 22 additions & 12 deletions test-data/unit/check-namedtuple.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,13 @@ x._replace(5) # E: Too many positional arguments for "_replace" of "X"
[builtins fixtures/list.pyi]

[case testNamedTupleReplaceAsClass]
# flags: --new-semantic-analyzer --no-strict-optional
from collections import namedtuple

X = namedtuple('X', ['x', 'y'])
x = None # type: X
X._replace(x, x=1, y=2)
X._replace(x=1, y=2) # E: Missing positional argument "self" in call to "_replace" of "X"
X._replace(x=1, y=2) # E: Missing positional argument "_self" in call to "_replace" of "X"

[builtins fixtures/list.pyi]

Expand Down Expand Up @@ -497,7 +498,9 @@ b = B._make(['']) # type: B

[builtins fixtures/list.pyi]

-- Depends on tuple fallback PR
[case testNamedTupleIncompatibleRedefinition]
# flags: --no-new-semantic-analyzer
from typing import NamedTuple
class Crash(NamedTuple):
count: int # E: Incompatible types in assignment (expression has type "int", base class "tuple" defined the type as "Callable[[Tuple[int, ...], Any], int]")
Expand Down Expand Up @@ -573,6 +576,7 @@ tmp/b.py:4: error: Revealed type is 'Tuple[Any, fallback=a.N]'
tmp/b.py:7: error: Revealed type is 'Tuple[Any, fallback=a.N]'

[case testSimpleSelfReferentialNamedTuple]
# flags: --no-new-semantic-analyzer
from typing import NamedTuple
class MyNamedTuple(NamedTuple):
parent: 'MyNamedTuple'
Expand All @@ -583,8 +587,8 @@ def bar(nt: MyNamedTuple) -> MyNamedTuple:
x: MyNamedTuple
reveal_type(x.parent)
[out]
main:2: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:9: error: Revealed type is 'Tuple[Any, fallback=__main__.MyNamedTuple]'
main:3: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:10: error: Revealed type is 'Tuple[Any, fallback=__main__.MyNamedTuple]'

-- Some crazy self-referential named tuples and types dicts
-- to be sure that everything works
Expand All @@ -611,6 +615,7 @@ class B:
[out]

[case testSelfRefNT1]
# flags: --no-new-semantic-analyzer
from typing import Tuple, NamedTuple

Node = NamedTuple('Node', [ # E: Recursive types not fully supported yet, nested types replaced with "Any"
Expand All @@ -623,6 +628,7 @@ reveal_type(n) # E: Revealed type is 'Tuple[builtins.str, builtins.tuple[Tuple[b


[case testSelfRefNT2]
# flags: --no-new-semantic-analyzer
from typing import Tuple, NamedTuple

A = NamedTuple('A', [ # E
Expand All @@ -637,10 +643,11 @@ n: A
reveal_type(n) # E: Revealed type is 'Tuple[builtins.str, builtins.tuple[Tuple[Tuple[builtins.str, builtins.tuple[Any], fallback=__main__.A], builtins.int, fallback=__main__.B]], fallback=__main__.A]'
[builtins fixtures/tuple.pyi]
[out]
main:3: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:7: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:4: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:8: error: Recursive types not fully supported yet, nested types replaced with "Any"

[case testSelfRefNT3]
# flags: --no-new-semantic-analyzer
from typing import NamedTuple, Tuple

class B(NamedTuple): # E
Expand All @@ -659,9 +666,10 @@ lst = [m, n]
reveal_type(lst[0]) # E: Revealed type is 'Tuple[builtins.object, builtins.object]'
[builtins fixtures/tuple.pyi]
[out]
main:3: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:4: error: Recursive types not fully supported yet, nested types replaced with "Any"

[case testSelfRefNT4]
# flags: --no-new-semantic-analyzer
from typing import NamedTuple

class B(NamedTuple): # E
Expand All @@ -676,10 +684,11 @@ n: A
reveal_type(n.y[0]) # E: Revealed type is 'Tuple[builtins.str, Tuple[Any, builtins.int, fallback=__main__.B], fallback=__main__.A]'
[builtins fixtures/tuple.pyi]
[out]
main:3: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:7: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:4: error: Recursive types not fully supported yet, nested types replaced with "Any"
main:8: error: Recursive types not fully supported yet, nested types replaced with "Any"

[case testSelfRefNT5]
# flags: --no-new-semantic-analyzer
from typing import NamedTuple

B = NamedTuple('B', [ # E: Recursive types not fully supported yet, nested types replaced with "Any"
Expand All @@ -697,6 +706,7 @@ reveal_type(f) # E: Revealed type is 'def (m: Tuple[Tuple[builtins.str, Tuple[An
[builtins fixtures/tuple.pyi]

[case testRecursiveNamedTupleInBases]
# flags: --no-new-semantic-analyzer
from typing import List, NamedTuple, Union

Exp = Union['A', 'B'] # E: Recursive types not fully supported yet, nested types replaced with "Any"
Expand All @@ -716,6 +726,7 @@ my_eval(A([B(1), B(2)])) # OK
[out]

[case testNamedTupleImportCycle]
# flags: --new-semantic-analyzer
import b
[file a.py]
class C:
Expand All @@ -725,10 +736,8 @@ from b import tp
x: tp
reveal_type(x.x) # E: Revealed type is 'builtins.int'

# Unfortunately runtime part doesn't work yet, see docstring in SemanticAnalyzerPass3.update_imported_vars()
reveal_type(tp) # E: Revealed type is 'Any' \
# E: Cannot determine type of 'tp'
tp('x') # E: Cannot determine type of 'tp'
reveal_type(tp) # E: Revealed type is 'def (x: builtins.int) -> Tuple[builtins.int, fallback=b.tp]'
tp('x') # E: Argument 1 to "tp" has incompatible type "str"; expected "int"

[file b.py]
from a import C
Expand All @@ -738,6 +747,7 @@ tp = NamedTuple('tp', [('x', int)])
[out]

[case testSubclassOfRecursiveNamedTuple]
# flags: --no-new-semantic-analyzer
from typing import List, NamedTuple

class Command(NamedTuple): # type: ignore
Expand Down