Fix execution contexts on the REPL #466
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
abadger
force-pushed
the
fix-422
branch
2 times, most recently
from
7f00888 to
5ebf643
Compare
|
I'm not sure what the issue is trying to build this on pypy. The test suite passes locally for me on pypy but I have a newer version than is running on travis: https://toshio.fedorapeople.org/sh-passing-tests-on-local-pypy.log |
|
Okay, I grabbed the travis version of pypy in a VM and I found the problem. Older versions of pypy don't report parent[1] in the same way as CPython (and newer pypy corrects it). I'll special case that to get it to work. |
On the REPL and from the command line, Python doesn't keep source code in the stack frame for the toplevel. Therefore we can't inspect it and look for the variable being assigned to in order to remove it from sys.modules. This is a cornercase but we can hack around it by trying to retrieve the variable name from the code object instead. This depends more heavily on Python internals but this was already code which dove into Python's internals a bit so perhaps this is okay. Fixes amoffat#422
|
Great work on this @abadger and solid test 👍. Will go out with the next release. |
|
Cool. Thanks for merging all the outstanding PRs :-) I noticed some sloppy coding I included in this PR. I'll submit another PR within the hour to address that. |
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.
This is a fix for #422
On the REPL and from the command line, Python doesn't keep source code
in the stack frame for the toplevel. Therefore we can't inspect it and
look for the variable being assigned to in order to remove it from
sys.modules.
This is a cornercase but we can hack around it by trying to retrieve the
variable name from the code object instead. This depends more heavily
on Python internals but this was already code which dove into Python's
internals a bit so perhaps this is okay.
Since I needed to run the tests on Python3.7, this also includes a fix for the test suite on Python3.7I pulled the Python-3.7 changes out to their own PR.