Remove some references to Py2. #15838
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
The checks in `conf.py` and `matplotlib/__init__.py` are not useful because the files are in fact not Py2-compatible (this has been the case for `__init__.py` for a while...) due to f-strings/nonlocal, so someone trying to run the file on Py2 will get a SyntaxError instead of the error message. In image.py the cast to int remains necessary even on Py3 because round(np.float) returns a np.float, not a np.int.
tacaswell
approved these changes
Dec 5, 2019
ksunden
reviewed
Dec 5, 2019
| @@ -1167,7 +1167,6 @@ def make_image(self, renderer, magnification=1.0, unsampled=False): | |||
| l, b, r, t = self.axes.bbox.extents | |||
| width = (round(r) + 0.5) - (round(l) - 0.5) | |||
| height = (round(t) + 0.5) - (round(b) - 0.5) | |||
| # The extra cast-to-int is only needed for python2 | |||
| width = int(round(width * magnification)) | |||
| height = int(round(height * magnification)) | |||
There was a problem hiding this comment.
Should this PR also remove the cast to int indicated by the comment as only beeing needed in py2?
There was a problem hiding this comment.
The comment was wrong, we need to cast to int in both cases as round returns a float and down-stream code requires an int.
timhoffm
approved these changes
Dec 5, 2019
The codebase is Py3 anyway nobody should expect it to be able to run it on Py2. |
|
It is belt-and-suspenders against clever users that find someway to run into this. The one that came up most recently was someone had py2 installed, cloned the repo and tried to build the docs against their installed version of Matplotlib. |
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.
The checks in
conf.pyandmatplotlib/__init__.pyare not usefulbecause the files are in fact not Py2-compatible (this has been the case
for
__init__.pyfor a while...) due to f-strings/nonlocal, so someonetrying to run the file on Py2 will get a SyntaxError instead of the
error message.
In image.py the cast to int remains necessary even on Py3 because
round(np.float) returns a np.float, not a np.int.
PR Summary
PR Checklist