8000 CLN: Cython Py2/3 Compatible Imports by WillAyd · Pull Request #23940 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

CLN: Cython Py2/3 Compatible Imports #23940

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 18 commits into from
Dec 26, 2018
Merged

CLN: Cython Py2/3 Compatible Imports #23940

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0c84dcb
Updated setup
WillAyd Nov 27, 2018
0e90b55
Conversion to absolute imports
WillAyd Nov 27, 2018
62bee57
Missed imports, division, unicode compat
WillAyd Nov 27, 2018
43c8098
Missing import resolution for strptime
WillAyd Nov 27, 2018
385e2da
Timestamp import failure
WillAyd Nov 27, 2018
836f3f2
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Nov 28, 2018
7522818
Reverted non-import changes
WillAyd Nov 28, 2018
ea818aa
Reverted floor div changes
WillAyd Nov 28, 2018
1d6d196
LINT fixup
WillAyd Dec 1, 2018
4d0437f
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Dec 1, 2018
c78d1a9
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Dec 3, 2018
5d09285
Relative imports in tslibs folder
WillAyd Dec 3, 2018
db2acb4
Missed relative imports
WillAyd Dec 3, 2018
f25c0d0
Back to absolute
WillAyd Dec 4, 2018
9034cba
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Dec 4, 2018
c3bce2f
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Dec 6, 2018
877b3d5
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Dec 25, 2018
b908e69
Merge remote-tracking branch 'upstream/master' into cython-py3-compat
WillAyd Dec 26, 2018
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
Prev Previous commit
Next Next commit
Missed relative imports
  • Loading branch information
@WillAyd
WillAyd committed Dec 3, 2018
commit db2acb414c5aec6b390b6f0000cccef763c4a227
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/conversion.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ cdef inline Py_ssize_t bisect_right_i8(int64_t *data,

cdef inline str _render_tstamp(int64_t val):
""" Helper function to render exception messages"""
from pandas._libs.tslibs.timestamps import Timestamp
from .timestamps import Timestamp
return str(Timestamp(val))


Expand Down
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/period.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ from cpython.datetime cimport (PyDateTime_Check, PyDelta_Check, PyDate_Check,
# import datetime C API
PyDateTime_IMPORT

from pandas._libs.tslibs.np_datetime cimport (
from .np_datetime cimport (
npy_datetimestruct, dtstruct_to_dt64, dt64_to_dtstruct,
pandas_datetime_to_datetimestruct, NPY_DATETIMEUNIT, NPY_FR_D)

Expand Down
11 changes: 5 additions & 6 deletions pandas/_libs/tslibs/timedeltas.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ PyDateTime_IMPORT


cimport pandas._libs.tslibs.util as util
from pandas._libs.tslibs.util cimport (
is_timedelta64_object, is_datetime64_object, is_integer_object,
is_float_object, is_string_object)
from .util cimport (is_timedelta64_object, is_datetime64_object,
is_integer_object, is_float_object, is_string_object)

from pandas._libs.tslibs.ccalendar import DAY_SECONDS
from .ccalendar import DAY_SECONDS

from pandas._libs.tslibs.np_datetime cimport (
cmp_scalar, reverse_ops, td64_to_tdstruct, pandas_timedeltastruct)
from .np_datetime cimport (cmp_scalar, reverse_ops, td64_to_tdstruct,
pandas_timedeltastruct)

from .nattype import nat_strings
from .nattype cimport checknull_with_nat, NPY_NAT, c_NaT as NaT
Expand Down
6 changes: 3 additions & 3 deletions pandas/_libs/tslibs/timestamps.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ from cpython.datetime cimport (datetime,
PyDateTime_IMPORT)
PyDateTime_IMPORT

from pandas._libs.util cimport (is_datetime64_object, is_timedelta64_object,
is_integer_object, is_string_object, is_array,
is_offset_object)
from .util cimport (is_datetime64_object, is_timedelta64_object,
is_integer_object, is_string_object, is_array,
is_offset_object)

cimport pandas._libs.tslibs.ccalendar as ccalendar
from .ccalendar import DAY_SECONDS
Expand Down
3 changes: 1 addition & 2 deletions pandas/_libs/tslibs/timezones.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ from numpy cimport int64_t
cnp.import_array()

# ----------------------------------------------------------------------
from pandas._libs.tslibs.util cimport (
is_string_object, is_integer_object, get_nat)
from .util cimport is_string_object, is_integer_object, get_nat

cdef int64_t NPY_NAT = get_nat()

Expand Down
0