String formatting > fstring #29892
String formatting > fstring #29892
Conversation
There was a problem hiding this comment.
@ForTimeBeing Thanks for the PR. minor suggestion otherwise lgtm.
pandas/tseries/frequencies.py
Outdated
| @@ -260,8 +260,7 @@ def infer_freq(index, warn=True): | |||
| if isinstance(index, pd.Index) and not isinstance(index, pd.DatetimeIndex): | |||
| if isinstance(index, (pd.Int64Index, pd.Float64Index)): | |||
| raise TypeError( | |||
| "cannot infer freq from a non-convertible index " | |||
| "type {type}".format(type=type(index)) | |||
| "cannot infer freq from a non-convertible index " f"type {type(index)}" | |||
There was a problem hiding this comment.
can you manually concatenate these two literals
There was a problem hiding this comment.
Sorry, maybe I am misunderstanding you. Do you mean to make them each 1 string instead of 2?
There was a problem hiding this comment.
yes. just this one. (it's a result of the black reformatting)
| @@ -1007,7 +1007,7 @@ def test_cumsum(self, data, expected, numpy): | |||
| np.cumsum(SparseArray(data), out=out) | |||
| else: | |||
| axis = 1 # SparseArray currently 1-D, so only axis = 0 is valid. | |||
| msg = "axis\\(={axis}\\) out of bounds".format(axis=axis) | |||
| msg = f"axis\\(={axis}\\) out of bounds" | |||
There was a problem hiding this comment.
do "f" and "r" prefixes play nicely together?
There was a problem hiding this comment.
I will need to add repr won't I since fstring defaults to str()?
There was a problem hiding this comment.
I would prefer to use re.escape than use raw string
There was a problem hiding this comment.
Like so?
re.escape(f"axis(={axis}) out of bounds")
There was a problem hiding this comment.
that looks correct. does it work?
There was a problem hiding this comment.
It passes the git diff test and compiles, I am unsure how to test that exact line unfortunately. Trying to learn but that is beyond me. This is the biggest project ive worked on
There was a problem hiding this comment.
This is part of a test. so OK if tests passing.
There was a problem hiding this comment.
Yep if you can make change as suggested by @simonjayhawkins would be great, otherwise lgtm
|
can you merge master; ping on green. |
|
thanks @ForTimeBeing |
xref #29547
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diffMore fstring changes