PR: Fix merge of 18966 #22202
Merged
PR: Fix merge of 18966 #22202
Conversation
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 was referenced Jan 11, 2022
tacaswell
approved these changes
Jan 11, 2022
|
This was probably my mistake when rebasing the qt6 support PR 🐑 . |
jklymak
approved these changes
Jan 12, 2022
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Jan 12, 2022
dstansby
added a commit
that referenced
this pull request
Jan 12, 2022
…202-on-v3.5.x Backport PR #22202 on branch v3.5.x (PR: Fix merge of 18966)
oscargus
reviewed
Jan 22, 2022
| @@ -537,8 +536,7 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None): | |||
| parent._fedit_dialog.close() | |||
| parent._fedit_dialog = dialog | |||
|
|
|||
| if qt_compat._exec(dialog): | |||
| return dialog.get() | |||
| dialog.show() | |||
There was a problem hiding this comment.
This change lead to that fedit does not return any answer (other than None) leading to that the documentation and probably the examples where the result is printed should be changed.
6 tasks
8 tasks
dixon-kun
approved these changes
Feb 23, 2022
There was a problem hiding this comment.
[editted by @tacaswell ]]
Thank you for you interest in Matplotlib, however I have removed the self-portrait as I am not sure why it was posted.
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
It looks like the merge of #18966 had an issue. #18965 is back. This fixes it.
PR Checklist
Tests and Styling
pytestpasses).flake8-docstringsand runflake8 --docstring-convention=all).Documentation
doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).