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

Jump to bottom

REF: reso->creso in TSObject #49097

Merged
merged 1 commit into from
Oct 14, 2022
Merged

REF: reso->creso in TSObject #49097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pandas/_libs/tslibs/conversion.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ cdef class _TSObject:
int64_t value # numpy dt64
tzinfo tzinfo
bint fold
NPY_DATETIMEUNIT reso
NPY_DATETIMEUNIT creso

cdef void ensure_reso(self, NPY_DATETIMEUNIT reso)
cdef void ensure_reso(self, NPY_DATETIMEUNIT creso)


cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
Expand Down
14 changes: 7 additions & 7 deletions pandas/_libs/tslibs/conversion.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,16 @@ cdef class _TSObject:
# int64_t value # numpy dt64
# tzinfo tzinfo
# bint fold
# NPY_DATETIMEUNIT reso
# NPY_DATETIMEUNIT creso

def __cinit__(self):
# GH 25057. As per PEP 495, set fold to 0 by default
self.fold = 0
self.reso = NPY_FR_ns # default value
self.creso = NPY_FR_ns # default value

cdef void ensure_reso(self, NPY_DATETIMEUNIT reso):
if self.reso != reso:
self.value = convert_reso(self.value, self.reso, reso, False)
cdef void ensure_reso(self, NPY_DATETIMEUNIT creso):
if self.creso != creso:
self.value = convert_reso(self.value, self.creso, creso, False)


cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
Expand Down Expand Up @@ -246,7 +246,7 @@ cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
obj.value = NPY_NAT
elif is_datetime64_object(ts):
reso = get_supported_reso(get_datetime64_unit(ts))
obj.reso = reso
obj.creso = reso
obj.value = get_datetime64_nanos(ts, reso)
if obj.value != NPY_NAT:
pandas_datetime_to_datetimestruct(obj.value, reso, &obj.dts)
Expand Down Expand Up @@ -305,7 +305,7 @@ cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
raise TypeError(f'Cannot convert input [{ts}] of type {type(ts)} to '
f'Timestamp')

maybe_localize_tso(obj, tz, obj.reso)
maybe_localize_tso(obj, tz, obj.creso)
return obj


Expand Down
4 changes: 2 additions & 2 deletions pandas/_libs/tslibs/timestamps.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ cdef class _Timestamp(ABCTimestamp):
)

obj.value = value
obj.reso = reso
obj.creso = reso
pandas_datetime_to_datetimestruct(value, reso, &obj.dts)
maybe_localize_tso(obj, tz, reso)

Expand Down Expand Up @@ -1675,7 +1675,7 @@ class Timestamp(_Timestamp):
if not is_offset_object(freq):
freq = to_offset(freq)

return create_timestamp_from_ts(ts.value, ts.dts, ts.tzinfo, freq, ts.fold, ts.reso)
return create_timestamp_from_ts(ts.value, ts.dts, ts.tzinfo, freq, ts.fold, ts.creso)

def _round(self, freq, mode, ambiguous='raise', nonexistent='raise'):
cdef:
Expand Down