Skip to content

Commit 703a54b

Browse files
committed
cleanup cimports; avoid import *
1 parent 4224757 commit 703a54b

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

pandas/_libs/lib.pyx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
# cython: profile=False
2-
cimport numpy as np
3-
cimport cython
4-
import numpy as np
5-
import sys
2+
import operator
63

7-
cdef bint PY3 = (sys.version_info[0] >= 3)
8-
9-
from numpy cimport *
4+
cimport cython
5+
from cython cimport Py_ssize_t
106

7+
import numpy as np
8+
cimport numpy as np
9+
from numpy cimport (ndarray, PyArray_NDIM, PyArray_GETITEM, PyArray_SETITEM,
10+
PyArray_ITER_DATA, PyArray_ITER_NEXT, PyArray_IterNew,
11+
flatiter, NPY_OBJECT,
12+
int64_t,
13+
float32_t, float64_t,
14+
uint8_t, uint64_t,
15+
complex128_t)
1116
# initialize numpy
1217
np.import_array()
1318
np.import_ufunc()
@@ -57,9 +62,9 @@ from tslib import NaT, Timestamp, Timedelta, array_to_datetime
5762
from interval import Interval
5863
from missing cimport checknull
5964

60-
cdef int64_t NPY_NAT = util.get_nat()
6165

6266
cimport util
67+
cdef int64_t NPY_NAT = util.get_nat()
6368
from util cimport is_array, _checknull
6469

6570
from libc.math cimport fabs
@@ -497,7 +502,6 @@ def maybe_booleans_to_slice(ndarray[uint8_t] mask):
497502
@cython.wraparound(False)
498503
@cython.boundscheck(False)
499504
def scalar_compare(ndarray[object] values, object val, object op):
500-
import operator
501505
cdef:
502506
Py_ssize_t i, n = len(values)
503507
ndarray[uint8_t, cast=True] result
@@ -532,7 +536,7 @@ def scalar_compare(ndarray[object] values, object val, object op):
532536
result[i] = True
533537
else:
534538
try:
535-
result[i] = cpython.PyObject_RichCompareBool(x, val, flag)
539+
result[i] = PyObject_RichCompareBool(x, val, flag)
536540
except (TypeError):
537541
result[i] = True
538542
elif flag == cpython.Py_EQ:
@@ -544,7 +548,7 @@ def scalar_compare(ndarray[object] values, object val, object op):
544548
result[i] = False
545549
else:
546550
try:
547-
result[i] = cpython.PyObject_RichCompareBool(x, val, flag)
551+
result[i] = PyObject_RichCompareBool(x, val, flag)
548552
except (TypeError):
549553
result[i] = False
550554

@@ -556,7 +560,7 @@ def scalar_compare(ndarray[object] values, object val, object op):
556560
elif isnull_val:
557561
result[i] = False
558562
else:
559-
result[i] = cpython.PyObject_RichCompareBool(x, val, flag)
563+
result[i] = PyObject_RichCompareBool(x, val, flag)
560564

561565
return result.view(bool)
562566

@@ -585,7 +589,6 @@ cpdef bint array_equivalent_object(object[:] left, object[:] right):
585589
@cython.wraparound(False)
586590
@cython.boundscheck(False)
587591
def vec_compare(ndarray[object] left, ndarray[object] right, object op):
588-
import operator
589592
cdef:
590593
Py_ssize_t i, n = len(left)
591594
ndarray[uint8_t, cast=True] result
@@ -620,7 +623,7 @@ def vec_compare(ndarray[object] left, ndarray[object] right, object op):
620623
if checknull(x) or checknull(y):
621624
result[i] = True
622625
else:
623-
result[i] = cpython.PyObject_RichCompareBool(x, y, flag)
626+
result[i] = PyObject_RichCompareBool(x, y, flag)
624627
else:
625628
for i in range(n):
626629
x = left[i]
@@ -629,7 +632,7 @@ def vec_compare(ndarray[object] left, ndarray[object] right, object op):
629632
if checknull(x) or checknull(y):
630633
result[i] = False
631634
else:
632-
result[i] = cpython.PyObject_RichCompareBool(x, y, flag)
635+
result[i] = PyObject_RichCompareBool(x, y, flag)
633636

634637
return result.view(bool)
635638

0 commit comments

Comments
 (0)