More python3 cleanup #10861
Merged
More python3 cleanup #10861
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
anntzer
reviewed
Mar 22, 2018
lib/matplotlib/axes/_axes.py
Outdated
| @@ -5607,7 +5601,7 @@ def pcolor(self, *args, **kwargs): | ||
| if 'antialiased' in kwargs: | ||
| kwargs['antialiaseds'] = kwargs.pop('antialiased') | ||
| if 'antialiaseds' not in kwargs and ( | ||
| isinstance(ec, six.string_types) and ec.lower() == "none"): | ||
| isinstance(ec, str) and ec.lower() == "none"): |
anntzer
reviewed
Mar 22, 2018
| __bool__ = __nonzero__ | ||
| def __bool__(self): | ||
| """Return the truth value of a UnitDbl.""" | ||
| return self._value.__bool__() |
anntzer
reviewed
Mar 22, 2018
| label = unit | ||
| else: | ||
| label = unit.label() | ||
| label = unit if isinstance(unit, str) else unit.label() |
anntzer
reviewed
Mar 22, 2018
lib/matplotlib/text.py
Outdated
| @@ -63,7 +59,7 @@ def get_rotation(rotation): | ||
| try: | ||
| angle = float(rotation) | ||
| except (ValueError, TypeError): | ||
| isString = isinstance(rotation, six.string_types) | ||
| isString = isinstance(rotation, str) |
There was a problem hiding this comment.
looks like good place to use cbook._str_equal too...
anntzer
approved these changes
Mar 22, 2018
dopplershift
approved these changes
Mar 22, 2018
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
Title says it all.