FIX 2-tuple of colors in to_rgba_array #26952
Merged
+6
−1
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
tacaswell
approved these changes
Sep 28, 2023
QuLogic
reviewed
Sep 29, 2023
lib/matplotlib/colors.py
Outdated
| @@ -435,7 +435,7 @@ def to_rgba_array(c, alpha=None): | |||
| (n, 4) array of RGBA colors, where each channel (red, green, blue, | |||
| alpha) can assume values between 0 and 1. | |||
| """ | |||
| if isinstance(c, tuple) and len(c) == 2: | |||
| if isinstance(c, tuple) and len(c) == 2 and isinstance(c[1], (int, float)): | |||
There was a problem hiding this comment.
We have Real here, I think:
Suggested change
| if isinstance(c, tuple) and len(c) == 2 and isinstance(c[1], (int, float)): | |
| if isinstance(c, tuple) and len(c) == 2 and isinstance(c[1], Real): |
There was a problem hiding this comment.
Thanks! I think I knew that in the past but then forgot...
Done.
timhoffm
approved these changes
Sep 29, 2023
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Sep 29, 2023
oscargus
added a commit
that referenced
this pull request
Oct 2, 2023
…952-on-v3.8.x Backport PR #26952 on branch v3.8.x (FIX 2-tuple of colors in to_rgba_array)
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
Fixes #26949. We just shouldn't assume that a 2-tuple passed to
to_rgba_arrayis a single (color, alpha) pair.PR checklist