Don't add self argument if nested function in method #6769
Merged
Conversation
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
gvanrossum
reviewed
May 6, 2019
mypy/fastparse.py
Outdated
| @@ -513,6 +516,7 @@ def do_func_def(self, n: Union[ast3.FunctionDef, ast3.AsyncFunctionDef], | |||
| func_type.definition = func_def | |||
| func_type.line = lineno | |||
|
|
|||
| retval: Union[FuncDef, Decorator] | |||
There was a problem hiding this comment.
Because mypy needs to run with Python 3.5, you can't use this PEP-526 syntax here yet (which is 3.6 or later only). To fix this, use a type comment on the first line that assigns to retval.
gvanrossum
approved these changes
May 6, 2019
mypy/fastparse.py
Outdated
| @@ -249,6 +249,8 @@ def __init__(self, | |||
| is_stub: bool, | |||
| errors: Errors) -> None: | |||
| self.class_nesting = 0 | |||
There was a problem hiding this comment.
Shouldn't you delete this variable? It's no longer updated.
| @@ -737,6 +737,14 @@ class A: | |||
| main:6: error: Incompatible types in assignment (expression has type "int", variable has type "A") | |||
| main:8: error: Argument 1 to "g" has incompatible type "A"; expected "int" | |||
|
|
|||
| [case testNestedFunctionInMethodWithTooFewArgumentsInTypeComment] | |||
There was a problem hiding this comment.
Perhaps you could also add a test for a few other configurations of the stack, e.g. a method inside a class inside a method (i.e. ['C', 'F', 'C', 'F'])?
|
Thanks! Ready to be merged once the tests pass. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #5806.