Skip to content

Commit 81b5e74

Browse files
authored
REF: reso->creso in TSObject (#49097)
1 parent 76c02f3 commit 81b5e74

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

pandas/_libs/tslibs/conversion.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ cdef class _TSObject:
2020
int64_t value # numpy dt64
2121
tzinfo tzinfo
2222
bint fold
23-
NPY_DATETIMEUNIT reso
23+
NPY_DATETIMEUNIT creso
2424

25-
cdef void ensure_reso(self, NPY_DATETIMEUNIT reso)
25+
cdef void ensure_reso(self, NPY_DATETIMEUNIT creso)
2626

2727

2828
cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,

pandas/_libs/tslibs/conversion.pyx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,16 @@ cdef class _TSObject:
205205
# int64_t value # numpy dt64
206206
# tzinfo tzinfo
207207
# bint fold
208-
# NPY_DATETIMEUNIT reso
208+
# NPY_DATETIMEUNIT creso
209209

210210
def __cinit__(self):
211211
# GH 25057. As per PEP 495, set fold to 0 by default
212212
self.fold = 0
213-
self.reso = NPY_FR_ns # default value
213+
self.creso = NPY_FR_ns # default value
214214

215-
cdef void ensure_reso(self, NPY_DATETIMEUNIT reso):
216-
if self.reso != reso:
217-
self.value = convert_reso(self.value, self.reso, reso, False)
215+
cdef void ensure_reso(self, NPY_DATETIMEUNIT creso):
216+
if self.creso != creso:
217+
self.value = convert_reso(self.value, self.creso, creso, False)
218218

219219

220220
cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
@@ -246,7 +246,7 @@ cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
246246
obj.value = NPY_NAT
247247
elif is_datetime64_object(ts):
248248
reso = get_supported_reso(get_datetime64_unit(ts))
249-
obj.reso = reso
249+
obj.creso = reso
250250
obj.value = get_datetime64_nanos(ts, reso)
251251
if obj.value != NPY_NAT:
252252
pandas_datetime_to_datetimestruct(obj.value, reso, &obj.dts)
@@ -305,7 +305,7 @@ cdef _TSObject convert_to_tsobject(object ts, tzinfo tz, str unit,
305305
raise TypeError(f'Cannot convert input [{ts}] of type {type(ts)} to '
306306
f'Timestamp')
307307

308-
maybe_localize_tso(obj, tz, obj.reso)
308+
maybe_localize_tso(obj, tz, obj.creso)
309309
return obj
310310

311311

pandas/_libs/tslibs/timestamps.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ cdef class _Timestamp(ABCTimestamp):
279279
)
280280

281281
obj.value = value
282-
obj.reso = reso
282+
obj.creso = reso
283283
pandas_datetime_to_datetimestruct(value, reso, &obj.dts)
284284
maybe_localize_tso(obj, tz, reso)
285285

@@ -1675,7 +1675,7 @@ class Timestamp(_Timestamp):
16751675
if not is_offset_object(freq):
16761676
freq = to_offset(freq)
16771677

1678-
return create_timestamp_from_ts(ts.value, ts.dts, ts.tzinfo, freq, ts.fold, ts.reso)
1678+
return create_timestamp_from_ts(ts.value, ts.dts, ts.tzinfo, freq, ts.fold, ts.creso)
16791679

16801680
def _round(self, freq, mode, ambiguous='raise', nonexistent='raise'):
16811681
cdef:

0 commit comments

Comments
 (0)