Skip to content

Commit

Permalink
Fixes for manylinux1
Browse files Browse the repository at this point in the history
Change-Id: Id1f5aa57b6fd090dc295a956e2a91b74e333fd96
  • Loading branch information
wesm committed May 14, 2017
1 parent 4e4c752 commit 45f1ecb
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions cpp/src/arrow/python/pandas_convert.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,7 @@ static inline bool PyObject_is_float(const PyObject* obj) {
}

static inline bool PyObject_is_integer(const PyObject* obj) {
#if PY_MAJOR_VERSION >= 3
return (!PyBool_Check(obj)) && (PyLong_Check(obj) || PyArray_IsIntegerScalar(obj));
#else
return (!PyBool_Check(obj)) &&
(PyInt_Check(obj) || PyLong_Check(obj) || PyArray_IsIntegerScalar(obj));
#endif
return (!PyBool_Check(obj)) && PyArray_IsIntegerScalar(obj);
}

template <int TYPE>
Expand Down

0 comments on commit 45f1ecb

Please sign in to comment.