Skip to content

Commit 5541783

Browse files
noamhernoamher
committed
refactor cdef-s in .pyx files
1 parent 013ae3d commit 5541783

File tree

14 files changed

+128
-104
lines changed

14 files changed

+128
-104
lines changed

‎pandas/_libs/hashtable.pyx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ include "hashtable_class_helper.pxi"
5252
include "hashtable_func_helper.pxi"
5353

5454
cdef class Factorizer:
55-
cdef public PyObjectHashTable table
56-
cdef public ObjectVector uniques
57-
cdef public Py_ssize_t count
55+
cdef public:
56+
PyObjectHashTable table
57+
ObjectVector uniques
58+
Py_ssize_t count
5859

5960
def __init__(self, size_hint):
6061
self.table = PyObjectHashTable(size_hint)
@@ -96,9 +97,10 @@ cdef class Factorizer:
9697

9798

9899
cdef class Int64Factorizer:
99-
cdef public Int64HashTable table
100-
cdef public Int64Vector uniques
101-
cdef public Py_ssize_t count
100+
cdef public:
101+
Int64HashTable table
102+
Int64Vector uniques
103+
Py_ssize_t count
102104

103105
def __init__(self, size_hint):
104106
self.table = Int64HashTable(size_hint)

‎pandas/_libs/internals.pyx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ from pandas._libs.algos import ensure_int64
2323

2424
cdef class BlockPlacement:
2525
# __slots__ = '_as_slice', '_as_array', '_len'
26-
cdef slice _as_slice
27-
cdef object _as_array
26+
cdef:
27+
slice _as_slice
28+
object _as_array
2829

29-
cdef bint _has_slice, _has_array, _is_known_slice_like
30+
bint _has_slice, _has_array, _is_known_slice_like
3031

3132
def __init__(self, val):
3233
cdef:

‎pandas/_libs/lib.pyx‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ cdef extern from "numpy/arrayobject.h":
4040
# Use PyDataType_* macros when possible, however there are no macros
4141
# for accessing some of the fields, so some are defined. Please
4242
# ask on cython-dev if you need more.
43-
cdef int type_num
44-
cdef int itemsize "elsize"
45-
cdef char byteorder
46-
cdef object fields
47-
cdef tuple names
43+
cdef:
44+
int type_num
45+
int itemsize "elsize"
46+
char byteorder
47+
object fields
48+
tuple names
4849

4950

5051
cdef extern from "src/parse_helper.h":
@@ -67,12 +68,13 @@ from pandas._libs.missing cimport (
6768

6869
# constants that will be compared to potentially arbitrarily large
6970
# python int
70-
cdef object oINT64_MAX = <int64_t>INT64_MAX
71-
cdef object oINT64_MIN = <int64_t>INT64_MIN
72-
cdef object oUINT64_MAX = <uint64_t>UINT64_MAX
71+
cdef:
72+
object oINT64_MAX = <int64_t>INT64_MAX
73+
object oINT64_MIN = <int64_t>INT64_MIN
74+
object oUINT64_MAX = <uint64_t>UINT64_MAX
7375

74-
cdef bint PY2 = sys.version_info[0] == 2
75-
cdef float64_t NaN = <float64_t>np.NaN
76+
bint PY2 = sys.version_info[0] == 2
77+
float64_t NaN = <float64_t>np.NaN
7678

7779

7880
def values_from_object(obj: object):

‎pandas/_libs/missing.pyx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ from pandas._libs.tslibs.nattype cimport (
1616
checknull_with_nat, c_NaT as NaT, is_null_datetimelike)
1717

1818

19-
cdef float64_t INF = <float64_t>np.inf
20-
cdef float64_t NEGINF = -INF
19+
cdef:
20+
float64_t INF = <float64_t>np.inf
21+
float64_t NEGINF = -INF
2122

22-
cdef int64_t NPY_NAT = util.get_nat()
23+
int64_t NPY_NAT = util.get_nat()
2324

2425

2526
cpdef bint checknull(object val):

‎pandas/_libs/parsers.pyx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ from pandas.errors import (ParserError, DtypeWarning,
6464
CParserError = ParserError
6565

6666

67-
cdef bint PY3 = (sys.version_info[0] >= 3)
67+
cdef:
68+
bint PY3 = (sys.version_info[0] >= 3)
6869

69-
cdef float64_t INF = <float64_t>np.inf
70-
cdef float64_t NEGINF = -INF
70+
float64_t INF = <float64_t>np.inf
71+
float64_t NEGINF = -INF
7172

7273

7374
cdef extern from "errno.h":
@@ -735,7 +736,7 @@ cdef class TextReader:
735736
int status
736737
int64_t hr, data_line
737738
char *errors = "strict"
738-
cdef StringPath path = _string_path(self.c_encoding)
739+
StringPath path = _string_path(self.c_encoding)
739740

740741
header = []
741742
unnamed_cols = set()
@@ -1389,8 +1390,9 @@ cdef class TextReader:
13891390
return None
13901391

13911392

1392-
cdef object _true_values = [b'True', b'TRUE', b'true']
1393-
cdef object _false_values = [b'False', b'FALSE', b'false']
1393+
cdef:
1394+
object _true_values = [b'True', b'TRUE', b'true']
1395+
object _false_values = [b'False', b'FALSE', b'false']
13941396

13951397

13961398
def _ensure_encoded(list lst):
@@ -1637,7 +1639,7 @@ cdef _categorical_convert(parser_t *parser, int64_t col,
16371639
int64_t current_category = 0
16381640

16391641
char *errors = "strict"
1640-
cdef StringPath path = _string_path(encoding)
1642+
StringPath path = _string_path(encoding)
16411643

16421644
int ret = 0
16431645
kh_str_t *table
@@ -1727,9 +1729,10 @@ cdef inline void _to_fw_string_nogil(parser_t *parser, int64_t col,
17271729
data += width
17281730

17291731

1730-
cdef char* cinf = b'inf'
1731-
cdef char* cposinf = b'+inf'
1732-
cdef char* cneginf = b'-inf'
1732+
cdef:
1733+
char* cinf = b'inf'
1734+
char* cposinf = b'+inf'
1735+
char* cneginf = b'-inf'
17331736

17341737

17351738
cdef _try_double(parser_t *parser, int64_t col,

‎pandas/_libs/skiplist.pyx‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ cdef class IndexableSkiplist:
5757
return self.get(i)
5858

5959
cpdef get(self, Py_ssize_t i):
60-
cdef Py_ssize_t level
61-
cdef Node node
60+
cdef:
61+
Py_ssize_t level
62+
Node node
6263

6364
node = self.head
6465
i += 1
@@ -71,9 +72,10 @@ cdef class IndexableSkiplist:
7172
return node.value
7273

7374
cpdef insert(self, double value):
74-
cdef Py_ssize_t level, steps, d
75-
cdef Node node, prevnode, newnode, next_at_level, tmp
76-
cdef list chain, steps_at_level
75+
cdef:
76+
Py_ssize_t level, steps, d
77+
Node node, prevnode, newnode, next_at_level, tmp
78+
list chain, steps_at_level
7779

7880
# find first node on each level where node.next[levels].value > value
7981
chain = [None] * self.maxlevels
@@ -110,9 +112,10 @@ cdef class IndexableSkiplist:
110112
self.size += 1
111113

112114
cpdef remove(self, double value):
113-
cdef Py_ssize_t level, d
114-
cdef Node node, prevnode, tmpnode, next_at_level
115-
cdef list chain
115+
cdef:
116+
Py_ssize_t level, d
117+
Node node, prevnode, tmpnode, next_at_level
118+
list chain
116119

117120
# find first node on each level where node.next[levels].value >= value
118121
chain = [None] * self.maxlevels

‎pandas/_libs/tslibs/nattype.pyx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ cdef class _NaT(datetime):
9494
# int64_t value
9595
# object freq
9696

97+
9798
def __hash__(_NaT self):
9899
# py3k needs this defined here
99100
return hash(self.value)

‎pandas/_libs/tslibs/parsing.pyx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ class DateParseError(ValueError):
4444
_DEFAULT_DATETIME = datetime(1, 1, 1).replace(hour=0, minute=0,
4545
second=0, microsecond=0)
4646

47-
cdef object _TIMEPAT = re.compile(r'^([01]?[0-9]|2[0-3]):([0-5][0-9])')
47+
cdef:
48+
object _TIMEPAT = re.compile(r'^([01]?[0-9]|2[0-3]):([0-5][0-9])')
4849

49-
cdef set _not_datelike_strings = {'a', 'A', 'm', 'M', 'p', 'P', 't', 'T'}
50+
set _not_datelike_strings = {'a', 'A', 'm', 'M', 'p', 'P', 't', 'T'}
5051

5152
# ----------------------------------------------------------------------
5253

‎pandas/_libs/tslibs/period.pyx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ from pandas._libs.tslibs.nattype cimport (
5252
from pandas._libs.tslibs.offsets cimport to_offset
5353
from pandas._libs.tslibs.offsets import _Tick
5454

55-
cdef bint PY2 = str == bytes
56-
cdef enum:
57-
INT32_MIN = -2147483648
55+
cdef:
56+
bint PY2 = str == bytes
57+
enum:
58+
INT32_MIN = -2147483648
5859

5960

6061
ctypedef struct asfreq_info:

‎pandas/_libs/tslibs/resolution.pyx‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ from pandas._libs.tslibs.ccalendar cimport get_days_in_month
1616
# ----------------------------------------------------------------------
1717
# Constants
1818

19-
cdef int64_t NPY_NAT = get_nat()
20-
21-
cdef int RESO_NS = 0
22-
cdef int RESO_US = 1
23-
cdef int RESO_MS = 2
24-
cdef int RESO_SEC = 3
25-
cdef int RESO_MIN = 4
26-
cdef int RESO_HR = 5
27-
cdef int RESO_DAY = 6
19+
cdef:
20+
int64_t NPY_NAT = get_nat()
21+
22+
int RESO_NS = 0
23+
int RESO_US = 1
24+
int RESO_MS = 2
25+
int RESO_SEC = 3
26+
int RESO_MIN = 4
27+
int RESO_HR = 5
28+
int RESO_DAY = 6
2829

2930
# ----------------------------------------------------------------------
3031

0 commit comments

Comments
 (0)