Skip to content
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

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

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 tslib.pyx
  • Loading branch information
MomIsBestFriend committed Nov 10, 2019
commit 5ff5e400ffe3f31ed12d29fd42658c6ae1aece29
28 changes: 13 additions & 15 deletions pandas/_libs/tslib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,8 @@ def array_with_unit_to_datetime(ndarray values, object unit,

if ((fvalues < Timestamp.min.value).any()
or (fvalues > Timestamp.max.value).any()):
raise OutOfBoundsDatetime("cannot convert input with unit "
"'{unit}'".format(unit=unit))
raise OutOfBoundsDatetime(f"cannot convert input with unit "
f"'{unit}'")
result = (iresult * m).astype('M8[ns]')
iresult = result.view('i8')
iresult[mask] = NPY_NAT
Expand All @@ -384,8 +384,8 @@ def array_with_unit_to_datetime(ndarray values, object unit,
except OverflowError:
if is_raise:
raise OutOfBoundsDatetime(
"cannot convert input {val} with the unit "
"'{unit}'".format(val=val, unit=unit))
f"cannot convert input {val} with the unit "
f"'{unit}'")
elif is_ignore:
raise AssertionError
iresult[i] = NPY_NAT
Expand All @@ -400,25 +400,25 @@ def array_with_unit_to_datetime(ndarray values, object unit,
except ValueError:
if is_raise:
raise ValueError(
"non convertible value {val} with the unit "
"'{unit}'".format(val=val, unit=unit))
f"non convertible value {val} with the unit "
f"'{unit}'")
elif is_ignore:
raise AssertionError
iresult[i] = NPY_NAT
except OverflowError:
if is_raise:
raise OutOfBoundsDatetime(
"cannot convert input {val} with the unit "
"'{unit}'".format(val=val, unit=unit))
f"cannot convert input {val} with the unit "
f"'{unit}'")
elif is_ignore:
raise AssertionError
iresult[i] = NPY_NAT

else:

if is_raise:
raise ValueError("unit='{0}' not valid with non-numerical "
"val='{1}'".format(unit, val))
raise ValueError(f"unit='{unit}' not valid with non-numerical "
f"val='{val}'")
if is_ignore:
raise AssertionError

Expand Down Expand Up @@ -600,9 +600,8 @@ cpdef array_to_datetime(ndarray[object] values, str errors='raise',
iresult[i] = NPY_NAT
continue
elif is_raise:
raise ValueError("time data {val} doesn't "
"match format specified"
.format(val=val))
raise ValueError(f"time data {val} doesn't "
f"match format specified")
return values, tz_out

try:
Expand Down Expand Up @@ -657,8 +656,7 @@ cpdef array_to_datetime(ndarray[object] values, str errors='raise',
if is_coerce:
iresult[i] = NPY_NAT
else:
raise TypeError("{typ} is not convertible to datetime"
.format(typ=type(val)))
raise TypeError(f"{type(val)} is not convertible to datetime")

except OutOfBoundsDatetime:
if is_coerce:
Expand Down