8000 CLN: F-string formatting in pandas/_libs/*.pyx by ShaharNaveh · Pull Request #29527 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

CLN: F-string formatting in pandas/_libs/*.pyx #29527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Nov 11, 2019
Merged

CLN: F-string formatting in pandas/_libs/*.pyx #29527

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4c3c6bd
Finished groupby.pyx
Nov 10, 2019
e64e327
Finished hashing.pyx
Nov 10, 2019
ba7c6be
Finished index.pyx
Nov 10, 2019
590c6a0
Finished internals.pyx
Nov 10, 2019
89bdecc
Finished interval.pyx
Nov 10, 2019
dd3e437
Finished lib.pyx
Nov 10, 2019
6fc5aca
Finished ops.pyx
Nov 10, 2019
3d193fa
Finished parsers.pyx
Nov 10, 2019
b09066b
Finished reduction.pyx
Nov 10, 2019
da6dcf0
Finished sparse.pyx
Nov 10, 2019
2667b09
Finished testing.pyx
Nov 10, 2019
5ff5e40
Finished tslib.pyx
Nov 10, 2019
f6db195
Finished window.pyx
Nov 10, 2019
5fbd795
Finished fixing errors in previous PR
Nov 10, 2019
3290a4a
Merge remote-tracking branch 'upstream/master' into F-string-pyx
Nov 10, 2019
3534311
added the \!r to the strings
Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Finished parsers.pyx
  • Loading branch information
MomIsBestFriend committed Nov 10, 2019
commit 3d193fa2a8ca237aed059fd146a4efe00f4c687f
28 changes: 14 additions & 14 deletions pandas/_libs/parsers.pyx
View file
Open in desktop
E998
Original file line number Diff line number Diff line change
Expand Up @@ -637,19 +637,19 @@ cdef class TextReader:
source = zip_file.open(file_name)

elif len(zip_names) == 0:
raise ValueError('Zero files found in compressed '
'zip file %s', source)
raise ValueError(f'Zero files found in compressed '
f'zip file {source}')
else:
raise ValueError('Multiple files found in compressed '
'zip file %s', str(zip_names))
raise ValueError(f'Multiple files found in compressed '
f'zip file {zip_names}')
elif self.compression == 'xz':
if isinstance(source, str):
source = _get_lzma_file(lzma)(source, 'rb')
else:
source = _get_lzma_file(lzma)(filename=source)
else:
raise ValueError('Unrecognized compression type: %s' %
self.compression)
raise ValueError(f'Unrecognized compression type: '
f'{self.compression}')

if b'utf-16' in (self.encoding or b''):
# we need to read utf-16 through UTF8Recoder.
Expand Down Expand Up @@ -703,8 +703,8 @@ cdef class TextReader:
self.parser.cb_io = &buffer_rd_bytes
self.parser.cb_cleanup = &del_rd_source
else:
raise IOError('Expected file path name or file-like object,'
' got %s type' % type(source))
raise IOError(f'Expected file path name or file-like object, '
f'got {type(source)} type')

cdef _get_header(self):
# header is now a list of lists, so field_count should use header[0]
Expand Down Expand Up @@ -744,8 +744,8 @@ cdef class TextReader:
msg = "[%s], len of %d," % (
','.join(str(m) for m in msg), len(msg))
raise ParserError(
'Passed header=%s but only %d lines in file'
% (msg, self.parser.lines))
f'Passed header={msg} but only '
f'{self.parser.lines} lines in file')

else:
field_count = self.parser.line_fields[hr]
Expand Down Expand Up @@ -779,7 +779,7 @@ cdef class TextReader:
if not self.has_mi_columns and self.mangle_dupe_cols:
while count > 0:
counts[name] = count + 1
name = '%s.%d' % (name, count)
name = f'{name}.{count}'
count = counts.get(name, 0)

if old_name == '':
Expand Down Expand Up @@ -1662,7 +1662,7 @@ cdef _to_fw_string(parser_t *parser, int64_t col, int64_t line_start,
char *data
ndarray result

result = np.empty(line_end - line_start, dtype='|S%d' % width)
result = np.empty(line_end - line_start, dtype=f'|S{width}')
data = <char*>result.data

with nogil:
Expand Down Expand Up @@ -2176,8 +2176,8 @@ def _concatenate_chunks(list chunks):
if warning_columns:
warning_names = ','.join(warning_columns)
warning_message = " ".join([
"Columns (%s) have mixed types." % warning_names,
"Specify dtype option on import or set low_memory=False."
f"Columns ({warning_names}) have mixed types."
f"Specify dtype option on import or set low_memory=False."
])
warnings.warn(warning_message, DtypeWarning, stacklevel=8)
return result
Expand Down
0