-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
fix: Set __file__ constant when using eval_file (#1300) #3233
Merged
Merged
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
82dc139
Set __file__ constant when using eval_file
Skylion007 f76ecc7
Use const ref
Skylion007 5ce8222
Use a move instead
Skylion007 38c57fb
Revert
Skylion007 f7ff7d5
Improve test
Skylion007 e9eb2c8
Guard test with Python version
Skylion007 93887fe
Fix tests
Skylion007 1c4d86c
Dont support Python2 API
Skylion007 bff887c
Drop Python2 eval __file__ support
Skylion007 3e34089
Hack
Skylion007 8b3c3ae
Semisupport Python2
Skylion007 2d5c38f
Take2
Skylion007 d5e56c3
Remove Python2 support
Skylion007 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 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 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 |
---|---|---|
|
@@ -3,5 +3,10 @@ | |
|
||
import test_cmake_build | ||
|
||
from .. import env | ||
|
||
if env.PY3: | ||
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. Without the matching guard in C++ we are as much creating a problem as we are solving one. |
||
assert isinstance(__file__, str) # Test this is properly set | ||
|
||
assert test_cmake_build.add(1, 2) == 3 | ||
print("{} imports, runs, and adds: 1 + 2 = 3".format(sys.argv[1])) |
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.
This looks great.
I see the
env.PY3
is giving us trouble. There is another easy trick, JIC there isn't a better one:(We'll find that easily when we clear out Python 2 with the firehose in a few months.)