Replace most uses of getfilesystemencoding by os.fs{en,de}code. #10513
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
jklymak
approved these changes
Jul 16, 2018
tacaswell
reviewed
Jul 22, 2018
lib/matplotlib/__init__.py
Outdated
| if getattr(sys, 'frozen', None): | ||
| yield sys.executable | ||
| # Try again assuming we need to step up one more directory. | ||
| yield os.path.dirname(sys.executable) |
There was a problem hiding this comment.
The logic seems wrong for the last two as in the original they did not have dirname applied.
There was a problem hiding this comment.
They do (original: exe_path = sys.path.dirname(...)). For the first one, the candidate will be
In [12]: Path(sys.executable).with_name("mpl-data")
Out[12]: PosixPath('/usr/bin/mpl-data')
In [13]: os.path.join(os.path.dirname(sys.executable), "mpl-data")
Out[13]: '/usr/bin/mpl-data'
tacaswell
requested changes
Jul 22, 2018
There was a problem hiding this comment.
I do not think the logic on the lest entry is correct.
It gives
In [37]: Path(sys.path[0]).with_name('mpl-data')
Out[37]: PosixPath('/home/tcaswell/.virtualenvs/dd36/lib/python3.6/mpl-data')where as the orginal gives
In [40]: os.path.join(sys.path[0], 'mpl-data')
Out[40]: '/home/tcaswell/.virtualenvs/dd36/lib/python3.6/site-packages/mpl-data'|
Indeed, the last entry was off by 1. I redid the logic, should be fixed now. |
tacaswell
approved these changes
Jul 23, 2018
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.
PR Summary
PR Checklist