Skip to content

Commit 62bee57

Browse files
WillAydWillAyd
committed
Missed imports, division, unicode compat
1 parent 0e90b55 commit 62bee57

16 files changed

+38
-41
lines changed

‎pandas/_libs/groupby.pyx

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ cdef inline float64_t median_linear(float64_t* a, int n) nogil:
5656
n -= na_count
5757

5858
if n % 2:
59-
result = kth_smallest_c( a, n / 2, n)
59+
result = kth_smallest_c( a, n // 2, n)
6060
else:
61-
result = (kth_smallest_c(a, n / 2, n) +
62-
kth_smallest_c(a, n / 2 - 1, n)) / 2
61+
result = (kth_smallest_c(a, n // 2, n) +
62+
kth_smallest_c(a, n // 2 - 1, n)) / 2
6363

6464
if na_count:
6565
free(a)

‎pandas/_libs/interval.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ from numpy cimport (
1717
cnp.import_array()
1818

1919

20-
cimport util
20+
cimport pandas._libs.util as util
2121
util.import_array()
2222

2323
from pandas._libs.hashtable cimport Int64Vector, Int64VectorData

‎pandas/_libs/join.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ outer_join_indexer_uint64 = outer_join_indexer["uint64_t"]
656656
# asof_join_by
657657
# ----------------------------------------------------------------------
658658

659-
from hashtable cimport (
659+
from pandas._libs.hashtable cimport (
660660
HashTable, PyObjectHashTable, UInt64HashTable, Int64HashTable)
661661

662662
ctypedef fused asof_t:

‎pandas/_libs/lib.pyx

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ cdef extern from "numpy/arrayobject.h":
4949
cdef extern from "src/parse_helper.h":
5050
int floatify(object, float64_t *result, int *maybe_int) except -1
5151

52-
cimport util
53-
from util cimport is_nan, UINT64_MAX, INT64_MAX, INT64_MIN
52+
cimport pandas._libs.util as util
53+
from pandas._libs.util cimport is_nan, UINT64_MAX, INT64_MAX, INT64_MIN
5454

5555
from pandas._libs.tslib import array_to_datetime
5656
from pandas._libs.tslibs.nattype cimport NPY_NAT

‎pandas/_libs/missing.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cimport numpy as cnp
88
from numpy cimport ndarray, int64_t, uint8_t, float64_t
99
cnp.import_array()
1010

11-
cimport util
11+
cimport pandas._libs.util as util
1212

1313
from pandas._libs.tslibs.np_datetime cimport (
1414
get_timedelta64_value, get_datetime64_value)

‎pandas/_libs/reduction.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ from numpy cimport (ndarray,
1515
flatiter)
1616
cnp.import_array()
1717

18-
cimport util
18+
cimport pandas._libs.util as util
1919
from pandas._libs.lib import maybe_convert_objects
2020

2121

‎pandas/_libs/tslib.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def format_array_from_datetime(ndarray[int64_t] values, object tz=None,
277277
dts.sec)
278278

279279
if show_ns:
280-
ns = dts.ps / 1000
280+
ns = dts.ps // 1000
281281
res += '.%.9d' % (ns + 1000 * dts.us)
282282
elif show_us:
283283
res += '.%.6d' % dts.us

‎pandas/_libs/tslibs/ccalendar.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ cpdef int32_t get_week_of_year(int year, int month, int day) nogil:
163163
# estimate
164164
woy = (doy - 1) - dow + 3
165165
if woy >= 0:
166-
woy = woy / 7 + 1
166+
woy = woy // 7 + 1
167167

168168
# verify
169169
if woy < 0:

‎pandas/_libs/tslibs/conversion.pxd

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ from cpython.datetime cimport datetime, tzinfo
44

55
from numpy cimport int64_t, int32_t
66

7-
from np_datetime cimport npy_datetimestruct
7+
from pandas._libs.tslibs.np_datetime cimport npy_datetimestruct
88

99

1010
cdef class _TSObject:

‎pandas/_libs/tslibs/conversion.pyx

+9-10
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ from cpython.datetime cimport (datetime, tzinfo,
1717
PyDateTime_CheckExact, PyDateTime_IMPORT)
1818
PyDateTime_IMPORT
1919

20-
from ccalendar import DAY_SECONDS, HOUR_SECONDS
20+
from pandas._libs.tslibs.ccalendar import DAY_SECONDS, HOUR_SECONDS
2121

22-
from np_datetime cimport (check_dts_bounds,
23-
npy_datetimestruct,
24-
pandas_datetime_to_datetimestruct, _string_to_dts,
25-
npy_datetime,
26-
dt64_to_dtstruct, dtstruct_to_dt64,
27-
get_datetime64_unit, get_datetime64_value,
28-
pydatetime_to_dt64, NPY_DATETIMEUNIT, NPY_FR_ns)
29-
from np_datetime import OutOfBoundsDatetime
22+
from pandas._libs.tslibs.np_datetime cimport (
23+
check_dts_bounds, npy_datetimestruct,
24+
pandas_datetime_to_datetimestruct, _string_to_dts,
25+
npy_datetime, dt64_to_dtstruct, dtstruct_to_dt64,
26+
get_datetime64_unit, get_datetime64_value,
27+
pydatetime_to_dt64, NPY_DATETIMEUNIT, NPY_FR_ns)
28+
from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime
3029

3130
from pandas._libs.tslibs.util cimport (
3231
is_string_object, is_datetime64_object, is_integer_object, is_float_object)
@@ -454,7 +453,7 @@ cdef _TSObject convert_str_to_tsobject(object ts, object tz, object unit,
454453
obj.dts.hour, obj.dts.min, obj.dts.sec,
455454
obj.dts.us, obj.tzinfo)
456455
obj = convert_datetime_to_tsobject(dt, tz,
457-
nanos=obj.dts.ps / 1000)
456+
nanos=obj.dts.ps // 1000)
458457
return obj
459458

460459
else:

‎pandas/_libs/tslibs/fields.pyx

+2-2
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
483483
continue
484484

485485
dt64_to_dtstruct(dtindex[i], &dts)
486-
out[i] = dts.ps / 1000
486+
out[i] = dts.ps // 1000
487487
return out
488488
elif field == 'doy':
489489
with nogil:
@@ -527,7 +527,7 @@ def get_date_field(ndarray[int64_t] dtindex, object field):
527527

528528
dt64_to_dtstruct(dtindex[i], &dts)
529529
out[i] = dts.month
530-
out[i] = ((out[i] - 1) / 3) + 1
530+
out[i] = ((out[i] - 1) // 3) + 1
531531
return out
532532

533533
elif field == 'dim':

‎pandas/_libs/tslibs/offsets.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ def shift_day(other: datetime, days: int) -> datetime:
534534

535535
cdef inline int year_add_months(npy_datetimestruct dts, int months) nogil:
536536
"""new year number after shifting npy_datetimestruct number of months"""
537-
return dts.year + (dts.month + months - 1) / 12
537+
return dts.year + (dts.month + months - 1) // 12
538538

539539

540540
cdef inline int month_add_months(npy_datetimestruct dts, int months) nogil:

‎pandas/_libs/tslibs/period.pyx

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ from cpython.datetime cimport (PyDateTime_Check, PyDelta_Check, PyDate_Check,
2020
# import datetime C API
2121
PyDateTime_IMPORT
2222

23-
from np_datetime cimport (npy_datetimestruct, dtstruct_to_dt64,
24-
dt64_to_dtstruct,
25-
pandas_datetime_to_datetimestruct,
26-
NPY_DATETIMEUNIT, NPY_FR_D)
23+
from pandas._libs.tslibs.np_datetime cimport (
24+
npy_datetimestruct, dtstruct_to_dt64, dt64_to_dtstruct,
25+
pandas_datetime_to_datetimestruct, NPY_DATETIMEUNIT, NPY_FR_D)
2726

2827
cdef extern from "src/datetime/np_datetime.h":
2928
int64_t npy_datetimestruct_to_datetime(NPY_DATETIMEUNIT fr,
@@ -38,7 +37,7 @@ from pandas._libs.tslibs.timezones cimport is_utc, is_tzlocal, get_dst_info
3837
from pandas._libs.tslibs.timedeltas import Timedelta
3938
from pandas._libs.tslibs.timedeltas cimport delta_to_nanoseconds
4039

41-
cimport pandas._libs.tslibs.ccalendar
40+
cimport pandas._libs.tslibs.ccalendar as ccalendar
4241
from pandas._libs.tslibs.ccalendar cimport (
4342
dayofweek, get_day_of_year, is_leapyear)
4443
from pandas._libs.tslibs.ccalendar import MONTH_NUMBERS

‎pandas/_libs/tslibs/strptime.pyx

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import numpy as np
2929
from numpy cimport int64_t
3030

3131

32-
from np_datetime cimport (check_dts_bounds,
33-
dtstruct_to_dt64, npy_datetimestruct)
32+
from pandas._libs.tslibs.np_datetime cimport (
33+
check_dts_bounds, dtstruct_to_dt64, npy_datetimestruct)
3434

3535
from pandas._libs.tslibs.util cimport is_string_object
3636

@@ -242,7 +242,7 @@ def array_strptime(object[:] values, object fmt,
242242
s += "0" * (9 - len(s))
243243
us = long(s)
244244
ns = us % 1000
245-
us = us / 1000
245+
us = us // 1000
246246
elif parse_code == 11:
247247
weekday = locale_time.f_weekday.index(found_dict['A'].lower())
248248
elif parse_code == 12:
@@ -664,7 +664,7 @@ cdef parse_timezone_directive(object z):
664664
gmtoff_remainder_padding = "0" * pad_number
665665
microseconds = int(gmtoff_remainder + gmtoff_remainder_padding)
666666

667-
total_minutes = ((hours * 60) + minutes + (seconds / 60) +
668-
(microseconds / 60000000))
667+
total_minutes = ((hours * 60) + minutes + (seconds // 60) +
668+
(microseconds // 60000000))
669669
total_minutes = -total_minutes if z.startswith("-") else total_minutes
670670
return pytz.FixedOffset(total_minutes)

‎pandas/_libs/tslibs/timestamps.pyx

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ from cpython.datetime cimport (datetime,
1616
PyDateTime_IMPORT)
1717
PyDateTime_IMPORT
1818

19-
from pandas._libsutil cimport (is_datetime64_object, is_timedelta64_object,
20-
is_integer_object, is_string_object, is_array,
21-
is_offset_object)
19+
from pandas._libs.util cimport (is_datetime64_object, is_timedelta64_object,
20+
is_integer_object, is_string_object, is_array,
21+
is_offset_object)
2222

23-
cimport pandas._libs.tslibs.ccalendar
23+
cimport pandas._libs.tslibs.ccalendar as ccalendar
2424
from pandas._libs.tslibs.ccalendar import DAY_SECONDS
2525
from pandas._libs.tslibs.conversion import (
2626
tz_localize_to_utc, normalize_i8_timestamps)
@@ -70,7 +70,7 @@ cdef inline object create_timestamp_from_ts(int64_t value,
7070
dts.sec, dts.us, tz)
7171
ts_base.value = value
7272
ts_base.freq = freq
73-
ts_base.nanosecond = dts.ps / 1000
73+
ts_base.nanosecond = dts.ps // 1000
7474

7575
return ts_base
7676

‎pandas/_libs/writers.pyx

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ from numpy cimport ndarray, uint8_t
1616

1717
ctypedef fused pandas_string:
1818
str
19-
unicode
2019
bytes
2120

2221

0 commit comments

Comments
 (0)