Fixup int handling changes.

In Python 2, we still need to allow for the possibility that a Python integer may be PyInt_Type instead of PyLong_Type.
lsst-dm · Aug 5, 2016 · 8d708f9 · 8d708f9
1 parent 74d522a
commit 8d708f9
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/include/ndarray/swig/PyConverter.h b/include/ndarray/swig/PyConverter.h
@@ -197,7 +197,12 @@ template <>
 struct PyConverter<int> : public detail::PyConverterBase<int> {
 
     static bool fromPythonStage1(PyPtr & input) {
-        if (!PyLong_Check(input.get()) && !PyLong_Check(input.get())) {
+        if (
+#if PY_MAJOR_VERSION <= 2
+            !PyInt_Check(input.get()) &&
+#endif
+            !PyLong_Check(input.get())
+        ) {
             PyPtr s(PyObject_Repr(input.get()));
             if (!s) return false;
             char * cs = PyBytes_AsString(s.get());
@@ -224,7 +229,12 @@ template <>
 struct PyConverter<long> : public detail::PyConverterBase<long> {
 
     static bool fromPythonStage1(PyPtr & input) {
-        if (!PyLong_Check(input.get()) && !PyLong_Check(input.get())) {
+        if (
+#if PY_MAJOR_VERSION <= 2
+            !PyInt_Check(input.get()) &&
+#endif
+            !PyLong_Check(input.get())
+        ) {
             PyPtr s(PyObject_Repr(input.get()));
             if (!s) return false;
             char * cs = PyBytes_AsString(s.get());