-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
fix: avoid false positive when module-level names match class-level names #10723
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
Open
joao-faria-dev
wants to merge
1
commit into
pylint-dev:main
Choose a base branch
from
joao-faria-dev:fix-c0103-module-class-name-conflict
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+47
−13
Open
Changes from all commits
Commits
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
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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Fixed false positive for ``invalid-name`` where module-level constants were incorrectly classified as variables when a class-level attribute with the same name exists. | ||
|
|
||
| Closes #10719 |
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 |
|---|---|---|
|
|
@@ -1847,24 +1847,40 @@ def is_reassigned_before_current(node: nodes.NodeNG, varname: str) -> bool: | |
| """Check if the given variable name is reassigned in the same scope before the | ||
| current node. | ||
| """ | ||
| return any( | ||
| a.name == varname and a.lineno < node.lineno | ||
| for a in node.scope().nodes_of_class( | ||
| (nodes.AssignName, nodes.ClassDef, nodes.FunctionDef) | ||
| ) | ||
| ) | ||
| node_scope = node.scope() | ||
| node_lineno = node.lineno | ||
| if node_lineno is None: | ||
| return False | ||
| for a in node_scope.nodes_of_class( | ||
| (nodes.AssignName, nodes.ClassDef, nodes.FunctionDef) | ||
| ): | ||
| if a.name == varname and a.lineno is not None and a.lineno < node_lineno: | ||
| if isinstance(a, (nodes.ClassDef, nodes.FunctionDef)): | ||
| if a.parent and a.parent.scope() == node_scope: | ||
| return True | ||
| elif a.scope() == node_scope: | ||
| return True | ||
| return False | ||
|
Comment on lines
+1850
to
+1863
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we factor out the duplication with the other util? |
||
|
|
||
|
|
||
| def is_reassigned_after_current(node: nodes.NodeNG, varname: str) -> bool: | ||
| """Check if the given variable name is reassigned in the same scope after the | ||
| current node. | ||
| """ | ||
| return any( | ||
| a.name == varname and a.lineno > node.lineno | ||
| for a in node.scope().nodes_of_class( | ||
| (nodes.AssignName, nodes.ClassDef, nodes.FunctionDef) | ||
| ) | ||
| ) | ||
| node_scope = node.scope() | ||
| node_lineno = node.lineno | ||
| if node_lineno is None: | ||
| return False | ||
| for a in node_scope.nodes_of_class( | ||
| (nodes.AssignName, nodes.ClassDef, nodes.FunctionDef) | ||
| ): | ||
| if a.name == varname and a.lineno is not None and a.lineno > node_lineno: | ||
| if isinstance(a, (nodes.ClassDef, nodes.FunctionDef)): | ||
| if a.parent and a.parent.scope() == node_scope: | ||
| return True | ||
| elif a.scope() == node_scope: | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think |
||
| return True | ||
| return False | ||
|
|
||
|
|
||
| def is_deleted_after_current(node: nodes.NodeNG, varname: str) -> bool: | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| """Test module-level constants with class attribute same name | ||
| Regression test for #10719. | ||
| """ | ||
| # pylint: disable=missing-docstring, too-few-public-methods, redefined-builtin | ||
|
|
||
|
|
||
| class Theme: | ||
| INPUT = ">>> " | ||
|
|
||
|
|
||
| INPUT = Theme() | ||
| input = Theme() | ||
| OUTPUT = Theme() | ||
| output = Theme() |
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
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| redefined-outer-name:11:4:11:9:clobbering:Redefining name 'value' from outer scope (line 6):UNDEFINED | ||
| redefined-outer-name:12:4:12:9:clobbering:Redefining name 'value' from outer scope (line 7):UNDEFINED |
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.
When I remove this condition I get no test failures. I'd like to see a test to make sure this is what we want.