Skip to content

Commit a1736a9

Browse files
committed
included pd.na check
1 parent f65f0de commit a1736a9

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

pandas/_libs/tslibs/strptime.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ from numpy cimport (
2020
ndarray,
2121
)
2222

23+
from pandas._libs.missing cimport checknull_with_nat_and_na
2324
from pandas._libs.tslibs.nattype cimport (
2425
NPY_NAT,
2526
c_nat_strings as nat_strings,
26-
checknull_with_nat,
2727
)
2828
from pandas._libs.tslibs.np_datetime cimport (
2929
check_dts_bounds,
@@ -134,7 +134,7 @@ def array_strptime(ndarray[object] values, object fmt, bint exact=True, errors='
134134
iresult[i] = NPY_NAT
135135
continue
136136
else:
137-
if checknull_with_nat(val):
137+
if checknull_with_nat_and_na(val):
138138
iresult[i] = NPY_NAT
139139
continue
140140
else:

pandas/core/tools/datetimes.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,7 @@
5656
ABCDataFrame,
5757
ABCSeries,
5858
)
59-
from pandas.core.dtypes.missing import (
60-
isna,
61-
notna,
62-
)
59+
from pandas.core.dtypes.missing import notna
6360

6461
from pandas.arrays import (
6562
DatetimeArray,
@@ -393,19 +390,11 @@ def _convert_listlike_datetimes(
393390
format = None
394391

395392
if format is not None:
396-
try:
397-
res = _to_datetime_with_format(
398-
arg, orig_arg, name, tz, format, exact, errors, infer_datetime_format
399-
)
400-
if res is not None:
401-
return res
402-
except ValueError as err:
403-
# GH#42957: ValueError: time data '<NA>'
404-
# does not match format '%Y%m%d%H%M%S'
405-
if any(isna(arg)):
406-
format = None
407-
else:
408-
raise err
393+
res = _to_datetime_with_format(
394+
arg, orig_arg, name, tz, format, exact, errors, infer_datetime_format
395+
)
396+
if res is not None:
397+
return res
409398

410399
assert format is None or infer_datetime_format
411400
utc = tz == "utc"

0 commit comments

Comments
 (0)