Convert to fstring #30094
Closed
Convert to fstring #30094
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
alimcmaster1
requested changes
Dec 5, 2019
| @@ -223,7 +223,7 @@ cpdef _period_str_to_code(str freqstr): | |||
| try: | |||
| return _period_code_map[freqstr] | |||
| except KeyError: | |||
| raise ValueError(INVALID_FREQ_ERR_MSG.format(freqstr)) | |||
| raise ValueError(INVALID_FREQ_ERR_MSG(freqstr)) | |||
There was a problem hiding this comment.
Hi,
In order to converting str.format() to f string I changed INVALID_FREQ_ERR_MSG definition from predefined string to lambda function. Now error message is defined in one place and is callable without .format().
Current definition:
INVALID_FREQ_ERR_MSG = lambda arg: f"Invalid frequency {arg}"
So now message is called as a function:
INVALID_FREQ_ERR_MSG(arg_str)
pandas/_libs/tslibs/period.pyx
Outdated
| @@ -1209,8 +1209,8 @@ 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.
Double quotes for f string please
There was a problem hiding this comment.
single quotes changed to double quotes
| @@ -1598,7 +1599,7 @@ cdef class _Period: | |||
| def __richcmp__(self, other, op): | |||
| if is_period_object(other): | |||
| if other.freq != self.freq: | |||
| msg = DIFFERENT_FREQ.format(cls=type(self).__name__, | |||
| msg = DIFFERENT_FREQ(cls=type(self).__name__, | |||
There was a problem hiding this comment.
same deal as abowe in frequencies.pyx file. DIFFERENT_FREQ is now a lambda function
|
My changes are causing problems, closing pull request . |
3 tasks
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