Skip to content

Commit 657699e

Browse files
author
MarcoGorelli
committed
fix segfault
1 parent 93d80a8 commit 657699e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pandas/_libs/tslibs/conversion.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ cdef int64_t parse_pydatetime(
5555
object val,
5656
npy_datetimestruct *dts,
5757
bint utc_convert,
58-
) except -1
58+
) except *

pandas/_libs/tslibs/conversion.pyx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ from pandas._libs.tslibs.nattype cimport (
6666
c_NaT as NaT,
6767
c_nat_strings as nat_strings,
6868
)
69+
from pandas._libs.tslibs.timestamps cimport _Timestamp
6970
from pandas._libs.tslibs.tzconversion cimport (
7071
Localizer,
7172
tz_localize_to_utc_single,
@@ -701,7 +702,7 @@ cdef int64_t parse_pydatetime(
701702
object val,
702703
npy_datetimestruct *dts,
703704
bint utc_convert,
704-
) except -1:
705+
) except *:
705706
"""
706707
Convert pydatetime to datetime64.
707708

0 commit comments

Comments
 (0)