Two bugs found via another PR #636
Merged
Conversation
This file contains 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
rules.py __setstate__() `mathics.builtin.builtins` was renamed to `mathics.builtin._builtins` I guess on the assumption it was private. It turns out it wasn't. And we were using the older (more correct) name "builtins" instead of "_builtins". Use "_builtins" to make this work. `__setstate__` apparently isn't used right now, but would be if we used `deepcopy()`. Note that in another PR, this variable is renamed `system_builtins_dict`. rest: Change imports of Builtin from `mathics.builtin` to mathics.builtin.base. `mathics.builtin only accidentially imports `Builtin`.
rocky
force-pushed
the
two-small-bugfixes
branch
from
e8c5c50
to
6844555
Compare
|
(After this goes in there will be a small merge conflict with #635 but that should be easy to fix) |
mmatera
reviewed
Nov 21, 2022
|
|
||
| self.function = getattr(builtins[cls], name) | ||
| self.function = getattr(_builtins[class_name], name) |
There was a problem hiding this comment.
I Just wonder, is it OK to keep the name _builtins for something that is not private to the module?
There was a problem hiding this comment.
This is a temporary change. #635 or a stripped down version of that has the more complete fix.
There was a problem hiding this comment.
In that case, let's merge and iterate.
Closed
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.
rules.py __setstate__():mathics.builtin.builtinswas renamed tomathics.builtin._builtinsI guess on the assumption it was private.
It turns out it wasn't. And we were using the older (more correct) name "builtins" instead of "_builtins". Use "_builtins" to make this work.
__setstate__apparently isn't used right now, but would be if we useddeepcopy(). Note that in #635, this variable is renamedsystem_builtins_dict.rest:
Change imports of Builtin from
mathics.builtintomathics.builtin.base.mathics.builtinonly accidentially importsBuiltin.