Revert "Convert adjust_bbox to use ExitStack." #18089
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
With the `ExitStack` and context managers, it's expected that everything is called in pairs, i.e., `adjust_bbox` followed by `restore_bbox`. When saving, `BackendBases.print_figure` calls `adjust_bbox` before and `restore_bbox` after the renderer-specific method. In raster renderers, that's all that happens. However, in mixed mode renderers, this is not the case. When it needs to rasterize (`MixedModeRendering.start_rasterizing`), it will change the DPI, restore the bbox, and re-adjust again. Internally, it hangs on to the new `restore_bbox`, but `print_figure` still has the original, which was cleared at the first `start_rasterizing` call, so when it calls `restore_bbox`, it does nothing because the stack is empty. So all that means that we need to revert the original change, as it needs to be possible to call `restore_bbox` more than once. This has not been a direct revert, as other cleanups happened in the meantime.
|
BTW, no tests failed when this change was made, but the example from the issue is a bit long. I will try and figure out a simpler example so this is properly tested. |
tacaswell
approved these changes
Jul 29, 2020
jklymak
approved these changes
Jul 29, 2020
|
Owee, I'm MrMeeseeks, Look at me. There seem to be a conflict, please backport manually. Here are approximate instructions:
And apply the correct labels and milestones. Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon! If these instruction are inaccurate, feel free to suggest an improvement. |
QuLogic
pushed a commit
to QuLogic/matplotlib
that referenced
this pull request
Jul 29, 2020
dstansby
added a commit
that referenced
this pull request
Jul 29, 2020
…3.3.x Backport PR #18089 on branch v3.3.x
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
With the
ExitStackand context managers, it's expected that everything is called in pairs, i.e.,adjust_bboxfollowed byrestore_bbox. When saving,BackendBases.print_figurecallsadjust_bboxbefore andrestore_bboxafter the renderer-specific method. In raster renderers, that's all that happens.However, in mixed mode renderers, this is not the case. When it needs to rasterize (
MixedModeRendering.start_rasterizing), it will change the DPI, restore the bbox, and re-adjust again. Internally, it hangs on to the newrestore_bbox, butprint_figurestill has the original, which was cleared at the firststart_rasterizingcall, so when it callsrestore_bbox, it does nothing because the stack is empty.So all that means that we need to revert the original change, as it needs to be possible to call
restore_bboxmore than once. This has not been a direct revert, as other cleanups happened in the meantime.Fixes #18061.
PR Checklist