CLN: str.format -> f-strings for io/sas
#30409
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
|
@jyscao: Thanks for the contribution, and welcome to LGTM. Codecov failure can be ignored. |
Can you please change the word |
ShaharNaveh
reviewed
Dec 23, 2019
pandas/io/sas/sas_xport.py
Outdated
| @@ -367,8 +367,8 @@ def _read_header(self): | |||
| fl = field["field_length"] | |||
| if field["ntype"] == "numeric" and ((fl < 2) or (fl > 8)): | |||
| self.close() | |||
| msg = "Floating field width {0} is not between 2 and 8." | |||
| raise TypeError(msg.format(fl)) | |||
| msg = "f{Floating field width {fl} is not between 2 and 8.}" | |||
There was a problem hiding this comment.
The f is inside the string :)
There was a problem hiding this comment.
How very sloppy of me... Good eye, it has been fixed now.
jyscao
force-pushed
the
convert_f-strings
branch
from
a7d0c0b to
0916a04
Compare
WillAyd
requested changes
Dec 23, 2019
pandas/io/sas/sas7bdat.py
Outdated
| @@ -169,7 +169,7 @@ def _get_properties(self): | |||
| if buf in const.encoding_names: | |||
| self.file_encoding = const.encoding_names[buf] | |||
| else: | |||
| self.file_encoding = "unknown (code={name!s})".format(name=buf) | |||
| self.file_encoding = f"unknown (code={str(buf)})" | |||
There was a problem hiding this comment.
Suggested change
| self.file_encoding = f"unknown (code={str(buf)})" | |
| self.file_encoding = f"unknown (code={buf})" |
There was a problem hiding this comment.
I think we've been cleaning these up elsewhere; shouldn't need the str() call
|
restarted the travis build. LGTM. |
| ) | ||
| f"Warning: column count mismatch ({self.col_count_p1} + " | ||
| f"{self.col_count_p2} != " | ||
| f"{self.column_count})\n" | ||
| ) |
There was a problem hiding this comment.
for follow-up, this probably should use warnings rather than print
|
Thanks @jyscao |
AlexKirko
pushed a commit
to AlexKirko/pandas
that referenced
this pull request
Dec 29, 2019
* CLN: str.format -> f-strings for `io/sas` * Apply black style * Fix syntax error * Remove `str()` call
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 pandasgit diff upstream/master -u -- "*.py" | flake8 --diff