Skip to content

Commit 698a69e

Browse files
jbrockmendeljbrockmendel
authored
CLN: cython imports (#34176)
1 parent 1f1735e commit 698a69e

File tree

14 files changed

+35
-35
lines changed

14 files changed

+35
-35
lines changed

‎pandas/_libs/groupby.pyx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ cimport numpy as cnp
99
from numpy cimport (ndarray,
1010
int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t,
1111
uint32_t, uint64_t, float32_t, float64_t, complex64_t, complex128_t)
12+
from numpy.math cimport NAN
1213
cnp.import_array()
1314

14-
cdef extern from "numpy/npy_math.h":
15-
float64_t NAN "NPY_NAN"
16-
1715
from pandas._libs.util cimport numeric, get_nat
1816

1917
from pandas._libs.algos cimport (swap, TiebreakEnumType, TIEBREAK_AVERAGE,

‎pandas/_libs/hashtable.pyx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ from libc.stdlib cimport malloc, free
88
import numpy as np
99
cimport numpy as cnp
1010
from numpy cimport ndarray, uint8_t, uint32_t, float64_t
11+
from numpy.math cimport NAN
1112
cnp.import_array()
1213

13-
cdef extern from "numpy/npy_math.h":
14-
float64_t NAN "NPY_NAN"
1514

1615
from pandas._libs.khash cimport (
1716
khiter_t,
@@ -54,7 +53,7 @@ from pandas._libs.khash cimport (
5453
)
5554

5655

57-
cimport pandas._libs.util as util
56+
from pandas._libs cimport util
5857

5958
from pandas._libs.missing cimport checknull
6059

‎pandas/_libs/index.pyx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ from numpy cimport (
1919
cnp.import_array()
2020

2121

22-
cimport pandas._libs.util as util
22+
from pandas._libs cimport util
2323

24-
from pandas._libs.tslibs import Period, Timedelta
2524
from pandas._libs.tslibs.nattype cimport c_NaT as NaT
26-
from pandas._libs.tslibs.base cimport ABCTimestamp
25+
from pandas._libs.tslibs.base cimport ABCTimestamp, ABCTimedelta, ABCPeriod
2726

2827
from pandas._libs.hashtable cimport HashTable
2928

@@ -470,7 +469,7 @@ cdef class TimedeltaEngine(DatetimeEngine):
470469
return 'm8[ns]'
471470

472471
cdef int64_t _unbox_scalar(self, scalar) except? -1:
473-
if not (isinstance(scalar, Timedelta) or scalar is NaT):
472+
if not (isinstance(scalar, ABCTimedelta) or scalar is NaT):
474473
raise TypeError(scalar)
475474
return scalar.value
476475

@@ -480,7 +479,7 @@ cdef class PeriodEngine(Int64Engine):
480479
cdef int64_t _unbox_scalar(self, scalar) except? -1:
481480
if scalar is NaT:
482481
return scalar.value
483-
if isinstance(scalar, Period):
482+
if isinstance(scalar, ABCPeriod):
484483
# NB: we assume that we have the correct freq here.
485484
return scalar.ordinal
486485
raise TypeError(scalar)

‎pandas/_libs/internals.pyx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import cython
21
from collections import defaultdict
2+
3+
import cython
34
from cython import Py_ssize_t
45

56
from cpython.slice cimport PySlice_GetIndicesEx

‎pandas/_libs/interval.pyx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ from numpy cimport (
3333
cnp.import_array()
3434

3535

36-
cimport pandas._libs.util as util
36+
from pandas._libs cimport util
3737

3838
from pandas._libs.hashtable cimport Int64Vector
3939
from pandas._libs.tslibs.util cimport (
@@ -42,8 +42,7 @@ from pandas._libs.tslibs.util cimport (
4242
is_timedelta64_object,
4343
)
4444

45-
from pandas._libs.tslibs import Timestamp
46-
from pandas._libs.tslibs.timedeltas import Timedelta
45+
from pandas._libs.tslibs.base cimport ABCTimestamp, ABCTimedelta
4746
from pandas._libs.tslibs.timezones cimport tz_compare
4847

4948

@@ -329,7 +328,7 @@ cdef class Interval(IntervalMixin):
329328
raise ValueError(f"invalid option for 'closed': {closed}")
330329
if not left <= right:
331330
raise ValueError("left side of interval must be <= right side")
332-
if (isinstance(left, Timestamp) and
331+
if (isinstance(left, ABCTimestamp) and
333332
not tz_compare(left.tzinfo, right.tzinfo)):
334333
# GH 18538
335334
raise ValueError("left and right must have the same time zone, got "
@@ -341,7 +340,7 @@ cdef class Interval(IntervalMixin):
341340
def _validate_endpoint(self, endpoint):
342341
# GH 23013
343342
if not (is_integer_object(endpoint) or is_float_object(endpoint) or
344-
isinstance(endpoint, (Timestamp, Timedelta))):
343+
isinstance(endpoint, (ABCTimestamp, ABCTimedelta))):
345344
raise ValueError("Only numeric, Timestamp and Timedelta endpoints "
346345
"are allowed when constructing an Interval.")
347346

@@ -371,7 +370,7 @@ cdef class Interval(IntervalMixin):
371370
right = self.right
372371

373372
# TODO: need more general formatting methodology here
374-
if isinstance(left, Timestamp) and isinstance(right, Timestamp):
373+
if isinstance(left, ABCTimestamp) and isinstance(right, ABCTimestamp):
375374
left = left._short_repr
376375
right = right._short_repr
377376

‎pandas/_libs/lib.pyx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from collections import abc
22
from decimal import Decimal
3-
43
import warnings
54

65
import cython
@@ -63,7 +62,7 @@ cdef extern from "numpy/arrayobject.h":
6362
cdef extern from "src/parse_helper.h":
6463
int floatify(object, float64_t *result, int *maybe_int) except -1
6564

66-
cimport pandas._libs.util as util
65+
from pandas._libs cimport util
6766
from pandas._libs.util cimport is_nan, UINT64_MAX, INT64_MAX, INT64_MIN
6867

6968
from pandas._libs.tslib import array_to_datetime

‎pandas/_libs/missing.pyx‎

Lines changed: 1 addition & 1 deletion
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 pandas._libs.util as util
11+
from pandas._libs cimport util
1212

1313

1414
from pandas._libs.tslibs.np_datetime cimport get_datetime64_value, get_timedelta64_value

‎pandas/_libs/parsers.pyx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ cimport numpy as cnp
3434
from numpy cimport ndarray, uint8_t, uint64_t, int64_t, float64_t
3535
cnp.import_array()
3636

37-
cimport pandas._libs.util as util
37+
from pandas._libs cimport util
3838
from pandas._libs.util cimport UINT64_MAX, INT64_MAX, INT64_MIN
3939
import pandas._libs.lib as lib
4040

‎pandas/_libs/reduction.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ from numpy cimport (ndarray,
1414
flatiter)
1515
cnp.import_array()
1616

17-
cimport pandas._libs.util as util
17+
from pandas._libs cimport util
1818
from pandas._libs.lib import maybe_convert_objects, is_scalar
1919

2020

@@ -603,7 +603,7 @@ cdef class BlockSlider:
603603
arr.shape[1] = 0
604604

605605

606-
def compute_reduction(arr: np.ndarray, f, axis: int = 0, dummy=None, labels=None):
606+
def compute_reduction(arr: ndarray, f, axis: int = 0, dummy=None, labels=None):
607607
"""
608608
609609
Parameters

‎pandas/_libs/reshape.pyx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ from numpy cimport (
1515
uint64_t,
1616
)
1717

18-
cimport numpy as cnp
1918
import numpy as np
20-
from pandas._libs.lib cimport c_is_list_like
19+
cimport numpy as cnp
2120
cnp.import_array()
2221

22+
from pandas._libs.lib cimport c_is_list_like
23+
2324
ctypedef fused reshape_t:
2425
uint8_t
2526
uint16_t

0 commit comments

Comments
 (0)