Skip to content

Extension Module Compat Cleanup #29666

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 3 commits into from
Nov 18, 2019
Merged

Extension Module Compat Cleanup #29666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fcef20
Cleaned up compat for extension modules
WillAyd Nov 17, 2019
0a2410e
macro typo fix
WillAyd Nov 18, 2019
a1e26f9
lint
WillAyd Nov 18, 2019
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
5 changes: 0 additions & 5 deletions pandas/_libs/src/compat_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,8 @@ PANDAS_INLINE int slice_get_indices(PyObject *s,
Py_ssize_t *stop,
Py_ssize_t *step,
Py_ssize_t *slicelength) {
#if PY_VERSION_HEX >= 0x03000000
return PySlice_GetIndicesEx(s, length, start, stop,
step, slicelength);
Copy link
Member

Choose a reason for hiding this comment

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

if we're returning this unchanged, can we just use this function directly and not define an alias? i guess the pypy thing above might complicate this?

Copy link
Member

@gfyoung gfyoung Nov 17, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Unclear for me at this point, but makes sense to investigate in a follow-up.

#else
return PySlice_GetIndicesEx((PySliceObject *)s, length, start,
stop, step, slicelength);
#endif // PY_VERSION_HEX
}

#endif // PANDAS__LIBS_SRC_COMPAT_HELPER_H_
2 changes: 1 addition & 1 deletion pandas/_libs/src/parser/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The full license is in the LICENSE file, distributed with this software.
#define O_BINARY 0
#endif // O_BINARY

#if PY_VERSION_HEX >= 0x03060000 && defined(_WIN32)
#ifdef _WIN32
#define USE_WIN_UTF16
#include <Windows.h>
#endif
Expand Down