%s changed to fstring, single quotes in f string changed to double qu… #30108
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
jbrockmendel
reviewed
Dec 6, 2019
pandas/_libs/tslibs/period.pyx
Outdated
| @@ -1209,8 +1209,7 @@ def period_format(int64_t value, int freq, object fmt=None): | |||
| elif freq_group == 4000: # WK | |||
| left = period_asfreq(value, freq, 6000, 0) | |||
| right = period_asfreq(value, freq, 6000, 1) | |||
| return '%s/%s' % (period_format(left, 6000), | |||
| period_format(right, 6000)) | |||
| return f"(period_format(left, 6000)/period_format(right, 6000))" | |||
There was a problem hiding this comment.
are we calling this function inside a loop? if so, we may need to be careful about whether cython fstrings differently from % formatting
There was a problem hiding this comment.
more generally, id prefer to have non-trivial function calls occur outside of f-space.
There was a problem hiding this comment.
the CI failures look related to this
|
#30094 can you submit updates on the same PR opposed to a new PR in the future |
WillAyd
requested changes
Dec 17, 2019
pandas/_libs/tslibs/period.pyx
Outdated
| @@ -1209,8 +1209,7 @@ def period_format(int64_t value, int freq, object fmt=None): | |||
| elif freq_group == 4000: # WK | |||
| left = period_asfreq(value, freq, 6000, 0) | |||
| right = period_asfreq(value, freq, 6000, 1) | |||
| return '%s/%s' % (period_format(left, 6000), | |||
| period_format(right, 6000)) | |||
| return f"(period_format(left, 6000)/period_format(right, 6000))" | |||
There was a problem hiding this comment.
Suggested change
| return f"(period_format(left, 6000)/period_format(right, 6000))" | |
| return f"{period_format(left, 6000}/{period_format(right, 6000}" |
There was a problem hiding this comment.
just pushed this change. it fixed the errors for locally
|
LGTM |
|
over to you @WillAyd |
|
Thanks @Behemkot and @jbrockmendel |
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.
#29547 (comment)
#29547
changed %s to f strings and f ' ' to f " ".
str.format() remained unchanged due to:
#29547 (comment)