-
Notifications
You must be signed in to change notification settings - Fork 181
Fix del builtin #355
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
jayvdb
wants to merge
2
commits into
PyCQA:main
Choose a base branch
from
jayvdb:del-builtin
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.
Open
Fix del builtin #355
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 |
---|---|---|
|
@@ -185,6 +185,13 @@ class Builtin(Definition): | |
|
||
def __init__(self, name): | ||
super(Builtin, self).__init__(name, None) | ||
self.can_delete = False | ||
# __builtins__ and __file__ can always be deleted. | ||
# __debug__ can be deleted sometimes and not deleted other times. | ||
# Safest course of action is to assume it can be deleted, in | ||
# order that no error is reported by pyflakes | ||
elif name in ('__builtins__', '__file__', '__debug__'): | ||
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.
|
||
self.can_delete = True | ||
|
||
def __repr__(self): | ||
return '<%s object %r at 0x%x>' % (self.__class__.__name__, | ||
|
@@ -871,10 +878,13 @@ def on_conditional_branch(): | |
if isinstance(self.scope, FunctionScope) and name in self.scope.globals: | ||
self.scope.globals.remove(name) | ||
else: | ||
try: | ||
del self.scope[name] | ||
except KeyError: | ||
binding = self.scope.get(name, None) | ||
if not binding or ( | ||
isinstance(binding, Builtin) and not binding.can_delete): | ||
self.report(messages.UndefinedName, node, name) | ||
return | ||
|
||
del self.scope[name] | ||
|
||
def handleChildren(self, tree, omit=None): | ||
for node in iter_child_nodes(tree, omit=omit): | ||
|
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
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
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.
Can you please elaborate on this, it is failing for me.
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.
On my Python 3.7 (Rawhide),
__debug__
can be deleted.On earlier Python, locally, it isnt.
However it might come down to whether the Python build had debug enabled in it.
We might need to dig into the CPython source to find out, as I dont see any mention of this in peps