Adds check that rgb sequence is of length 3 #3092
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
| if [x for x in (r, g, b) if (float(x) < 0) or (x > 1)]: | ||
| if len(arg) == 3: | ||
| r, g, b = arg | ||
| if [x for x in (r, g, b) if (float(x) < 0) or (x > 1)]: |
There was a problem hiding this comment.
I think this would be better as if any(float(x) < 0 or float(x) > 0 for x in arg): (and might as well change the rest in this function too).
| @@ -349,8 +349,7 @@ def to_rgba(self, arg, alpha=None): | |||
| try: | |||
| if not cbook.is_string_like(arg) and cbook.iterable(arg): | |||
| if len(arg) == 4: | |||
| if [x for x in arg if (float(x) < 0) or (x > 1)]: | |||
| # This will raise TypeError if x is not a number. | |||
| if any(float(x) < 0. or float(x) > 1. for x in arg): | |||
There was a problem hiding this comment.
The second float conversion is unnecessary, as are both decimal points. The only purpose of the float conversion is to trigger an error if, for example,
arg = np.array(['a', 'b', 'c'])Contrary to the comment, it raises a ValueError; but that serves the purpose just as well.
tacaswell
added a commit
that referenced
this pull request
Jun 2, 2014
Adds check that rgb sequence is of length 3
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.
Fixes issue in #3079 . I ran the tests
and nothing breaks but I am unsure if it will break something else.