Skip to content

CLN: Some code cleanups in pandas/_libs/parsers.pyx #32369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 16, 2020
Merged

CLN: Some code cleanups in pandas/_libs/parsers.pyx #32369

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
deee851
CLN: Some code cleanups in pandas/_libs/parsers.pyx
Feb 29, 2020
973596c
Merge remote-tracking branch 'upstream/master' into CLN-_libs-parsers
Mar 5, 2020
5fdd71b
Reverted changes
Mar 5, 2020
c895bbd
Removed cdef for unused variables
Mar 5, 2020
117a71f
Merge remote-tracking branch 'upstream/master' into CLN-_libs-parsers
Mar 5, 2020
5c9f0cb
Merge remote-tracking branch 'upstream/master' into CLN-_libs-parsers
Mar 6, 2020
2b0bd62
Merge remote-tracking branch 'upstream/master' into CLN-_libs-parsers
Mar 7, 2020
0fba0a7
Reverted cdef
Mar 7, 2020
0447733
Merge remote-tracking branch 'upstream/master' into CLN-_libs-parsers
Mar 13, 2020
4d52f0c
Merge remote-tracking branch 'upstream/master' into CLN-_libs-parsers
Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions pandas/_libs/parsers.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,8 +1595,6 @@ cdef _categorical_convert(parser_t *parser, int64_t col,
cdef _to_fw_string(parser_t *parser, int64_t col, int64_t line_start,
int64_t line_end, int64_t width):
cdef:
Py_ssize_t i
coliter_t it
const char *word = NULL
char *data
ndarray result
Expand All @@ -1614,7 +1612,7 @@ cdef inline void _to_fw_string_nogil(parser_t *parser, int64_t col,
int64_t line_start, int64_t line_end,
size_t width, char *data) nogil:
cdef:
int64_t i
Py_ssize_t i
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only place where I am not removing a declaration of an unused variable, but I am chaning the cdef of it.

I can revert if this is unrelated to this PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would revert this. Technically this is used as the difference of line_start and line_end which are both int64_t, so makes sense to keep that declaration consistent particularly for 32 bit platforms

coliter_t it
const char *word = NULL

Expand All @@ -1641,15 +1639,11 @@ cdef _try_double(parser_t *parser, int64_t col,
bint na_filter, kh_str_starts_t *na_hashset, object na_flist):
cdef:
int error, na_count = 0
Py_ssize_t i, lines
coliter_t it
const char *word = NULL
char *p_end
Py_ssize_t lines
float64_t *data
float64_t NA = na_values[np.float64]
kh_float64_t *na_fset
ndarray result
khiter_t k
bint use_na_flist = len(na_flist) > 0

lines = line_end - line_start
Expand Down Expand Up @@ -1684,7 +1678,7 @@ cdef inline int _try_double_nogil(parser_t *parser,
coliter_t it
const char *word = NULL
char *p_end
khiter_t k, k64
khiter_t k64

na_count[0] = 0
coliter_setup(&it, parser, col, line_start)
Expand Down Expand Up @@ -1747,11 +1741,10 @@ cdef _try_uint64(parser_t *parser, int64_t col,
bint na_filter, kh_str_starts_t *na_hashset):
cdef:
int error
Py_ssize_t i, lines
Py_ssize_t lines
coliter_t it
uint64_t *data
ndarray result
khiter_t k
uint_state state

lines = line_end - line_start
Expand Down Expand Up @@ -1821,13 +1814,11 @@ cdef _try_int64(parser_t *parser, int64_t col,
bint na_filter, kh_str_starts_t *na_hashset):
cdef:
int error, na_count = 0
Py_ssize_t i, lines
Py_ssize_t lines
coliter_t it
int64_t *data
ndarray result

int64_t NA = na_values[np.int64]
khiter_t k

lines = line_end - line_start
result = np.empty(lines, dtype=np.int64)
Expand Down Expand Up @@ -1855,7 +1846,6 @@ cdef inline int _try_int64_nogil(parser_t *parser, int64_t col,
Py_ssize_t i, lines = line_end - line_start
coliter_t it
const char *word = NULL
khiter_t k

na_count[0] = 0
coliter_setup(&it, parser, col, line_start)
Expand Down Expand Up @@ -1891,9 +1881,7 @@ cdef _try_bool_flex(parser_t *parser, int64_t col,
const kh_str_starts_t *false_hashset):
cdef:
int error, na_count = 0
Py_ssize_t i, lines
coliter_t it
const char *word = NULL
Py_ssize_t lines
uint8_t *data
ndarray result

Expand Down Expand Up @@ -1925,7 +1913,6 @@ cdef inline int _try_bool_flex_nogil(parser_t *parser, int64_t col,
Py_ssize_t i, lines = line_end - line_start
coliter_t it
const char *word = NULL
khiter_t k

na_count[0] = 0
coliter_setup(&it, parser, col, line_start)
Expand Down Expand Up @@ -1980,10 +1967,8 @@ cdef kh_str_starts_t* kset_from_list(list values) except NULL:
# caller takes responsibility for freeing the hash table
cdef:
Py_ssize_t i
khiter_t k
kh_str_starts_t *table
int ret = 0

object val

table = kh_init_str_starts()
Expand Down Expand Up @@ -2011,7 +1996,6 @@ cdef kh_str_starts_t* kset_from_list(list values) except NULL:
cdef kh_float64_t* kset_float64_from_list(values) except NULL:
# caller takes responsibility for freeing the hash table
cdef:
Py_ssize_t i
khiter_t k
kh_float64_t *table
int ret = 0
Expand Down Expand Up @@ -2149,7 +2133,6 @@ cdef _apply_converter(object f, parser_t *parser, int64_t col,
int64_t line_start, int64_t line_end,
char* c_encoding):
cdef:
int error
Py_ssize_t i, lines
coliter_t it
const char *word = NULL
Expand Down