Updated .format() to f-strings #30027
Conversation
pandas/io/html.py
Outdated
| @@ -846,7 +846,7 @@ def _parser_dispatch(flavor): | |||
|
|
|||
|
|
|||
| def _print_as_set(s) -> str: | |||
| return "{" + "{arg}".format(arg=", ".join(pprint_thing(el) for el in s)) + "}" | |||
| return f"{{{', '.join(pprint_thing(el) for el in s)}}}" | |||
There was a problem hiding this comment.
Thanks for the PR. Looks good if you can address @jbrockmendel suggestions and I think CI failures are unrelated / have been fixed on master since this was created.
To be sure, can you locally on your f-strings branch run:
git fetch upstream
git merge upstream/master
git push origin f-stringsI think should get CI green for this. Flag me down at PyData if you have any questions
CI failures fixed on master.
| @@ -846,7 +846,8 @@ def _parser_dispatch(flavor): | |||
|
|
|||
|
|
|||
| def _print_as_set(s) -> str: | |||
| return "{" + "{arg}".format(arg=", ".join(pprint_thing(el) for el in s)) + "}" | |||
| arg = ", ".join(pprint_thing(el) for el in s) | |||
| return f"{{{arg}}}" | |||
There was a problem hiding this comment.
is this adding a layer of braces?
There was a problem hiding this comment.
you might be able to get rid of the pprint_thing, not sure
There was a problem hiding this comment.
The double brace is how to add a literal brace in an f-string, so looks OK
| @@ -616,8 +616,8 @@ def _build_xpath_expr(attrs) -> str: | |||
| if "class_" in attrs: | |||
| attrs["class"] = attrs.pop("class_") | |||
|
|
|||
| s = [f"@{k}={repr(v)}" for k, v in attrs.items()] | |||
| return "[{expr}]".format(expr=" and ".join(s)) | |||
| s = " and ".join([f"@{k}={repr(v)}" for k, v in attrs.items()]) | |||
There was a problem hiding this comment.
if you end up making another pass through this file, can you do this in two lines? i.e. keep s as it is now and do the join in a separate step
|
Thanks @dlalap congrats on first PR. If you'd like to address some suggestions from @jbrockmendel in a follow up would certainly welcome, along with any other contributions |
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diff