-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Support metaclasses #2475
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.
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
Support metaclasses #2475
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
b20cfa4
checker
elazarg 7eee764
checkexpr and checkmember
elazarg 6ab7368
nodes
elazarg 0d0e9ff
semanal
elazarg 41ecc84
types
elazarg 6dc66b2
testcheck
elazarg 314a300
fix name lookup and parse errors
elazarg 3a05361
Follow metaclass resollution as described in docs
elazarg c42f777
Some metaclass consistency checks
elazarg 5de0e80
Add tests
elazarg cf02b0d
serialization
elazarg f90fc80
Turns out subtyping is enough for iterable
elazarg ac49100
simplify diff
elazarg 4c70367
simplify diff cont.
elazarg 7876d3f
fix inference
elazarg c256da5
do not initialize metaclass from deserialize
elazarg d65c3b4
8000
fail for metaclass(Tuple)
elazarg b083a97
dont use set. fail for metaclass(Tuple)
elazarg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
nodes
- Loading branch information
commit 6ab73681e3a99457035461d9cf591c48d296dae3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1946,6 +1946,29 @@ def __init__(self, names: 'SymbolTable', defn: ClassDef, module_name: str) -> No | |
for vd in defn.type_vars: | ||
self.type_vars.append(vd.name) | ||
|
||
_metaclass_type = None # type: Optional[mypy.types.Instance] | ||
|
||
@property | ||
def metaclass_type(self) -> 'Optional[mypy.types.Instance]': | ||
if self._metaclass_type: | ||
return self._metaclass_type | ||
if self._fullname == 'builtins.type': | ||
return mypy.types.Instance(self, []) | ||
if self.mro is None: | ||
# XXX why does this happen? | ||
return None | ||
if len(self.mro) > 1: | ||
return self.mro[1].metaclass_type | ||
# FIX: assert False | ||
return None | ||
|
||
@metaclass_type.setter | ||
def metaclass_type(self, value: 'mypy.types.Instance'): | ||
self._metaclass_type = value | ||
|
||
def is_metaclass(self) -> bool: | ||
return self.has_base('builtins.type') | ||
|
||
def name(self) -> str: | ||
"""Short name.""" | ||
return self.defn.name | ||
3CAE
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have a sample that triggers this condition?
Presumably the clue is the comment in
__init__
on line 1940 above. Maybe it has something to do with the MRO being calculated twice -- the first time (in semanal.py on line 850) it may fail if there's an import cycle causing a base class being a forward reference; the second time on line 3128 in ThirdPass, called from build.py line 1440. (There's also a call from fixup.py, but I think that's not what you're seeing.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Turns out it happens during deserialization in incremental mode: the type of a direct base class may be None. (I should have looked into it long time ago. Sorry)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I will remove the call from deserialize, since it shouldn't be done yet - it should be done from fixup.py. Does it sound reasonable?