10000 Fix --incremental crash on Type[...] by ilevkivskyi · Pull Request #4038 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Fix --incremental crash on Type[...] #4038

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 2 commits into from
Oct 11, 2017
Merged

Fix --incremental crash on Type[...] #4038

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e82975
Fix --incremental crash on Type[...]
ilevkivskyi Sep 30, 2017
deb8047
Add one more test
ilevkivskyi Oct 4, 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
Next Next commit
Fix --incremental crash on Type[...]
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Sep 30, 2017
commit 3e82975db6c0f2348c4165a7b69bd99b9b97f490
19 changes: 14 additions & 5 deletions mypy/checkmember.py
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -177,26 +177,35 @@ def analyze_member_access(name: str,
elif isinstance(typ, TypeType):
# Similar to FunctionLike + is_type_obj() above.
item = None
fallback = builtin_type('builtins.type')
ignore_messages = msg.copy()
ignore_messages.disable_errors()
if isinstance(typ.item, Instance):
item = typ.item
elif isinstance(typ.item, AnyType):
fallback = builtin_type('builtins.type')
ignore_messages = msg.copy()
ignore_messages.disable_errors()
return analyze_member_access(name, fallback, node, is_lvalue, is_super,
is_operator, builtin_type, not_ready_callback,
ignore_messages, original_type=original_type, chk=chk)
elif isinstance(typ.item, TypeVarType):
if isinstance(typ.item.upper_bound, Instance):
item = typ.item.upper_bound
elif isinstance(typ.item, FunctionLike) and typ.item.is_type_obj():
item = typ.item.fallback
elif isinstance(typ.item, TypeType):
# Access member on metaclass object via Type[Type[C]]
if isinstance(typ.item.item, Instance):
item = typ.item.item.type.metaclass_type
if item and not is_operator:
# See comment above for why operators are skipped
result = analyze_class_attribute_access(item, name, node, is_lvalue,
builtin_type, not_ready_callback, msg,
original_type=original_type)
if result:
return result
fallback = builtin_type('builtins.type')
if not (isinstance(result, AnyType) and item.type.fallback_to_any):
return result
else:
# We don't want errors on metaclass lookup for classes with Any fallback
msg = ignore_messages
if item is not None:
fallback = item.type.metaclass_type or fallback
return analyze_member_access(name, fallback, node, is_lvalue, is_super,
Expand Down
8 changes: 2 additions & 6 deletions mypy/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,7 @@ def copy_modified(self,
)

def is_type_obj(self) -> bool:
t = self.fallback.type
return t is not None and t.is_metaclass()
return self.fallback.type.is_metaclass()

def is_concrete_type_obj(self) -> bool:
return self.is_type_obj() and self.is_classmethod_class
Expand Down Expand Up @@ -1341,10 +1340,7 @@ def __init__(self, item: Union[Instance, AnyType, TypeVarType, TupleType, NoneTy
type UnionType must be handled through make_normalized static method.
"""
super().__init__(line, column)
if isinstance(item, CallableType) and item.is_type_obj():
self.item = item.fallback
else:
self.item = item
self.item = item
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why does this change help? Is it because the type attribute of an Instance might refer to FakeInfo during deserialization?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes.

Copy link
Member Author

Choose a reason for hiding this comment

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

(Or previously to None)


@staticmethod
def make_normalized(item: Type, *, line: int = -1, column: int = -1) -> Type:
Expand Down
30 changes: 30 additions & 0 deletions test-data/unit/check-classes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3995,3 +3995,33 @@ class E(metaclass=t.M): pass
class F(six.with_metaclass(t.M)): pass
@six.add_metaclass(t.M)
class G: pass

[case testMetaclassMemberAccessViaType]
from typing import Type
class M(type):
def m(cls, x: int) -> int:
pass

class C(metaclass=M):
pass
x = C
y: Type[C] = C

reveal_type(type(C).m) # E: Revealed type is 'def (cls: __main__.M, x: builtins.int) -> builtins.int'
reveal_type(type(x).m) # E: Revealed type is 'def (cls: __main__.M, x: builtins.int) -> builtins.int'
reveal_type(type(y).m) # E: Revealed type is 'def (cls: __main__.M, x: builtins.int) -> builtins.int'
[out]

[case testMetaclassMemberAccessViaType2]
from typing import Any, Type
class M(type):
def m(cls, x: int) -> int:
pass
B: Any
class C(B, metaclass=M):
pass

x: Type[C]
reveal_type(x.m) # E: Revealed type is 'def (x: builtins.int) -> builtins.int'
reveal_type(x.whatever) # E: Revealed type is 'Any'
[out]
20 changes: 20 additions & 0 deletions test-data/unit/check-incremental.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3164,3 +3164,23 @@ import foo
external_list = [0]

[builtins fixtures/dict.pyi]

[case testIncrementalCrashOnTypeWithFunction]
import a
[file a.py]
import b
[file a.py.2]
from b import x

[file b.py]
from typing import TypeVar, Type
T = TypeVar('T')

def tp(arg: T) -> Type[T]:
pass
def func(x: int) -> int:
pass

x = tp(func)
[out]
[out2]
0