Skip to content

Follow-Up To #17875 #18043

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 5 commits into from
Oct 31, 2017
Merged

Follow-Up To #17875 #18043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f982e2
use abbreviated dtstruct functions, flake8 cleanup
jbrockmendel Oct 31, 2017
a491320
cleanup, reduce usage of src/datetime
jbrockmendel Oct 31, 2017
82f035a
whitespace cleanup
jbrockmendel Oct 31, 2017
9cc6ba3
update lint.sh per reviewer request
jbrockmendel Oct 31, 2017
4b09c96
revert lint
jbrockmendel Oct 31, 2017
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
16 changes: 6 additions & 10 deletions pandas/_libs/lib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,16 @@ cimport cpython
isnan = np.isnan
cdef double NaN = <double> np.NaN
cdef double nan = NaN
cdef double NAN = nan

from cpython.datetime cimport (PyDateTime_Check, PyDate_Check,
PyTime_Check, PyDelta_Check,
PyDateTime_IMPORT)
PyDateTime_IMPORT
# this is our tseries.pxd
from datetime cimport (
get_timedelta64_value, get_datetime64_value,
PyDateTime_Check, PyDate_Check, PyTime_Check, PyDelta_Check,
PyDateTime_IMPORT)
from datetime cimport get_timedelta64_value, get_datetime64_value


from tslib cimport (convert_to_tsobject, convert_to_timedelta64,
_check_all_nulls)
from tslib cimport _check_all_nulls
import tslib
from tslib import NaT, Timestamp, Timedelta
import interval
Expand All @@ -68,9 +67,6 @@ cdef extern from "math.h":
double sqrt(double x)
double fabs(double)

# import datetime C API
PyDateTime_IMPORT

# initialize numpy
import_array()
import_ufunc()
Expand Down
1 change: 1 addition & 0 deletions pandas/_libs/src/inference.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ from decimal import Decimal
cimport util
cimport cython
from tslib import NaT
from tslib cimport convert_to_tsobject, convert_to_timedelta64
from tslibs.timezones cimport get_timezone
from datetime import datetime, timedelta
iNaT = util.get_nat()
Expand Down
Loading