Skip to content

Commit ab1d2a7

Browse files
committed
BUG: Series.astype is unable to handle pd.nan (pandas-dev#46377)
1 parent c28fd8a commit ab1d2a7

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

pandas/_libs/tslibs/nattype.pyx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ from numpy cimport int64_t
2828
cnp.import_array()
2929

3030
cimport pandas._libs.tslibs.util as util
31-
from pandas._libs.missing cimport C_NA
3231
from pandas._libs.tslibs.np_datetime cimport (
3332
get_datetime64_value,
3433
get_timedelta64_value,
@@ -1218,7 +1217,7 @@ cdef inline bint checknull_with_nat(object val):
12181217
"""
12191218
Utility to check if a value is a nat or not.
12201219
"""
1221-
return val is None or util.is_nan(val) or val is c_NaT or val is C_NA
1220+
return val is None or util.is_nan(val) or val is c_NaT
12221221

12231222

12241223
cdef inline bint is_dt64nat(object val):

pandas/_libs/tslibs/period.pyx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ from libc.time cimport (
4343
import_datetime()
4444

4545
cimport pandas._libs.tslibs.util as util
46+
from pandas._libs.missing cimport C_NA
4647
from pandas._libs.tslibs.np_datetime cimport (
4748
NPY_DATETIMEUNIT,
4849
NPY_FR_D,
@@ -1470,7 +1471,7 @@ cdef inline int64_t _extract_ordinal(object item, str freqstr, freq) except? -1:
14701471
cdef:
14711472
int64_t ordinal
14721473

1473-
if checknull_with_nat(item):
1474+
if checknull_with_nat(item) or item is C_NA:
14741475
ordinal = NPY_NAT
14751476
elif util.is_integer_object(item):
14761477
if item == NPY_NAT:

pandas/_libs/tslibs/timedeltas.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ from cpython.datetime cimport (
2828

2929
import_datetime()
3030

31-
3231
cimport pandas._libs.tslibs.util as util
3332
from pandas._libs.tslibs.base cimport ABCTimestamp
3433
from pandas._libs.tslibs.conversion cimport (

0 commit comments

Comments
 (0)