Skip to content

Strip type objects when constructing TypeType#2832

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
gvanrossum merged 4 commits into from
Mar 29, 2017
Merged

Strip type objects when constructing TypeType #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa2fe81
strip callable
elazarg Feb 8, 2017
4d67292
make sure Any becomes AnyType()
elazarg Feb 8, 2017
a7d92e2
ignore "builtins" in testtypegen
elazarg Feb 8, 2017
55949ea
builtins.Any -> Any (why?)
elazarg Mar 29, 2017
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
2 changes: 1 addition & 1 deletion mypy/test/testtypegen.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ def __init__(self) -> None:
self.is_typing = False

def visit_mypy_file(self, f: MypyFile) -> None:
self.is_typing = f.fullname() == 'typing'
self.is_typing = f.fullname() == 'typing' or f.fullname() == 'builtins'
super().visit_mypy_file(f)

def visit_assignment_stmt(self, s: AssignmentStmt) -> None:
Expand Down
2 changes: 1 addition & 1 deletion mypy/typeanal.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ def visit_unbound_type(self, t: UnboundType) -> Type:
return TypeVarType(sym.tvar_def, t.line)
elif fullname == 'builtins.None':
return NoneTyp()
elif fullname == 'typing.Any':
elif fullname == 'typing.Any' or fullname == 'builtins.Any':
return AnyType()
elif fullname == 'typing.Tuple':
if len(t.args) == 0 and not t.empty_tuple_index:
Expand Down
6 changes: 5 additions & 1 deletion mypy/types.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -384,6 +384,7 @@ class Instance(Type):

def __init__(self, typ: Optional[mypy.nodes.TypeInfo], args: List[Type],
line: int = -1, column: int = -1, erased: bool = False) -> None:
assert(typ is None or typ.fullname() not in ["builtins.Any", "typing.Any"])

@JukkaLJukkaLMar 30, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is not right -- typ should never be None. What's the purpose of this?

@elazargelazargMar 30, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is None in incremental mode

@JukkaLJukkaLMar 30, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I figured that out myself, but my comment was lost somehow. What about builtins.Any and typing.Any? Why are we creating an Instance type that corresponds to Any, and why is there a builtins.Any in addition to typing.Any? Shouldn't we use AnyType?

@elazargelazargMar 30, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we should, but these somehow got created in the tests. I have avoided this ( or fullname() == 'builtins' above), and added the assertions here to verify this is indeed the case. Perhaps we can remove the tests now.

As Guido said above - or at least as I understand his comment - it will be better not to define Any in builtins fixture at all.

self.type = typ
self.args = args
self.erased = erased
Expand DownExpand Up@@ -1146,7 +1147,10 @@ class TypeType(Type):

def __init__(self, item: Type, *, line: int = -1, column: int = -1) -> None:
super().__init__(line, column)
self.item = item
if isinstance(item, CallableType) and item.is_type_obj():
self.item = item.fallback
else:
self.item = item

def accept(self, visitor: 'TypeVisitor[T]') -> T:
return visitor.visit_type_type(self)
Expand Down
8 changes: 8 additions & 0 deletions test-data/unit/check-classes.test
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,3 +3111,11 @@ reveal_type(A.x) # E: Revealed type is 'Any'
A.f(1) # E: Too many arguments for "f" of "A"
A().g(1) # E: Too many arguments for "g" of "A"
[builtins fixtures/classmethod.pyi]

[case testMetaclassTypeCallable]
class M(type):
x = 5

class A(metaclass=M): pass
reveal_type(type(A).x) # E: Revealed type is 'builtins.int'

2 changes: 1 addition & 1 deletion test-data/unit/lib-stub/__builtin__.pyi
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
class Any: pass
Any = 0

class object:
def __init__(self):
Expand Down
2 changes: 1 addition & 1 deletion test-data/unit/lib-stub/builtins.pyi
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
class Any: pass
Any = 0

class object:
def __init__(self) -> None: pass
Expand Down
2 changes: 1 addition & 1 deletion test-data/unit/semanal-types.test
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -736,7 +736,7 @@ MypyFile:1(
f
Args(
Var(a))
def (a: builtins.Any) -> builtins.Any
def (a: Any) -> Any

@elazargelazargMar 29, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is new. I'm not comfortable with both the original and the new version.

Block:7(
ReturnStmt:7(
NameExpr(a [l]))))
Expand Down