CLN: Update old string formatting to f-string #30631
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
|
@thepaullee can you have a look at the CI please? Seems like some things are broken. |
pandas/core/ops/array_ops.py
Outdated
| @@ -246,17 +246,16 @@ def comparison_op( | |||
| res_values = comp_method_OBJECT_ARRAY(op, lvalues, rvalues) | |||
|
|
|||
| else: | |||
| op_name = "__{op}__".format(op=op.__name__) | |||
| op_name = f"__{op.__name__}" | |||
There was a problem hiding this comment.
Suggested change
| op_name = f"__{op.__name__}" | |
| op_name = f"__{op.__name__}__" |
|
Thanks @thepaullee! Do the maintainers have a preferred style for the changes introducing temporary variables just for f-strings? For example, https://github.com/pandas-dev/pandas/pull/30631/files#diff-f91291af4cee29af665968c2ffd05013R105-R106 isn't an obvious improvement to me. |
jreback
reviewed
Jan 3, 2020
| "and scalar of type [{typ}]".format( | ||
| op=op.__name__, dtype=x.dtype, typ=type(y).__name__ | ||
| ) | ||
| f"Cannot perform '{op.__name__}' with a dtyped [{x.dtype}] array " |
There was a problem hiding this comment.
i agree with @TomAugspurger here - i would simply in-line this rather than creating a temporary
temporary only if it’s a really complicated expr or has quoting itself (eg a .join(..)
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diffUpdates:
pandas/core/ops/array_ops.py
pandas/core/ops/dispatch.py
pandas/core/ops/docstrings.py
pandas/core/ops/invalid.py
pandas/core/ops/methods.py
pandas/core/ops/roperator.py