FIX: fail early for non-finite figure sizes #8647
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
QuLogic
reviewed
May 20, 2017
lib/matplotlib/figure.py
Outdated
| @@ -325,6 +325,10 @@ def __init__(self, | |||
| frameon = rcParams['figure.frameon'] | |||
|
|
|||
| self.bbox_inches = Bbox.from_bounds(0, 0, *figsize) | |||
| if not all(np.isfinite(_) for _ in figsize): | |||
There was a problem hiding this comment.
Why not check this before the expense of creating a Bbox (not that I know if that's a very large expense or not)?
There was a problem hiding this comment.
You can just write np.isfinite(figsize).all() (and similarly below): the ufunc will cast the input to an ndarray.
lib/matplotlib/figure.py
Outdated
| @@ -710,7 +714,9 @@ def set_size_inches(self, w, h=None, forward=True): | |||
| # argument, so unpack them | |||
| if h is None: | |||
| w, h = w | |||
|
|
|||
| if not all(np.isfinite(_) for _ in (h, w)): | |||
There was a problem hiding this comment.
Really picky, but it's kind of weird to have it be h, w when everything around it is w, h.
bef16b4 to
a4999ac
Compare
anntzer
reviewed
May 22, 2017
| @@ -710,7 +714,9 @@ def set_size_inches(self, w, h=None, forward=True): | |||
| # argument, so unpack them | |||
| if h is None: | |||
| w, h = w | |||
|
|
|||
| if not all(np.isfinite(_) for _ in (w, h)): | |||
There was a problem hiding this comment.
not convinced going through numpy is better in this case.
anntzer
approved these changes
May 23, 2017
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.
Closes #8640
PR Summary
If passed non-finite values to figure size or add_axes, raise immediately rather than at draw time.
PR Checklist