CLN: Old string formatting: .format() -> f"" #30328
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
pandas/core/internals/blocks.py
Outdated
| @@ -1056,8 +1046,7 @@ def coerce_to_target_dtype(self, other): | |||
| return self.astype(object) | |||
|
|
|||
| raise AssertionError( | |||
| "possible recursion in " | |||
| "coerce_to_target_dtype: {} {}".format(self, other) | |||
| "possible recursion in " f"coerce_to_target_dtype: {self} {other}" | |||
There was a problem hiding this comment.
an extra space snuck in the middle here (this is a common occurrence with black)
pandas/core/internals/blocks.py
Outdated
| @@ -1202,8 +1191,7 @@ def _interpolate( | |||
| if method in ("krogh", "piecewise_polynomial", "pchip"): | |||
| if not index.is_monotonic: | |||
| raise ValueError( | |||
| "{0} interpolation requires that the " | |||
| "index be monotonic.".format(method) | |||
| f"{method} interpolation requires that the " "index be monotonic." | |||
pandas/core/internals/blocks.py
Outdated
| ) | ||
| raise ValueError(invalid_arg) | ||
|
|
||
| if inspect.isclass(dtype) and issubclass(dtype, ExtensionDtype): | ||
| msg = ( | ||
| "Expected an instance of {}, but got the class instead. " | ||
| "Try instantiating 'dtype'.".format(dtype.__name__) | ||
| f"Expected an instance of {dtype.__name__}, but got the class instead. " |
There was a problem hiding this comment.
looks like the linter thinks this line is too long
|
Couple of small issues, otherwise this is a nice cleanup, thanks |
pandas/core/indexing.py
Outdated
|
|
||
| # check that the key does not exceed the maximum size of the index | ||
| if len(arr) and (arr.max() >= len_axis or arr.min() < -len_axis): | ||
| raise IndexError("positional indexers are out-of-bounds") | ||
| else: | ||
| raise ValueError( | ||
| "Can only index by location with " | ||
| "a [{types}]".format(types=self._valid_types) | ||
| "Can only index by location with " f"a [{self._valid_types}]" |
There was a problem hiding this comment.
extra space crept in, also down on 2059 (im going to stop pointing those out now)
There was a problem hiding this comment.
My fault. Missed them. Working... Expected such things to be fixed by a linter
pandas/core/indexing.py
Outdated
| "None of [{key}] are in the [{axis}]".format( | ||
| key=key, axis=self.obj._get_axis_name(axis) | ||
| ) | ||
| f"None of [{key}] are in the [{self.obj._get_axis_name(axis)}]" |
There was a problem hiding this comment.
nitpick: can you define axis_name = self.obj._get_axis_name(axis) on the previous line and use axis_name inside the fstring?
|
So there're some more |
baevpetr
changed the title
|
thanks @baevpetr |
AlexKirko
pushed a commit
to AlexKirko/pandas
that referenced
this pull request
Dec 29, 2019
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 pandasOld style % formatting to f-strings