Merge pull request #15304 from sethtroisi/remove_NPY_PY3K

mattip · web-flow · commit 0aa8370c68f0 · 2020-01-10T02:28:57.000+02:00
MAINT: Remove NPY_PY3K constant
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -467,10 +467,6 @@ def generate_config_h(ext, build_dir):
                 moredefs.append('NPY_DO_NOT_OPTIMIZE_LONGLONG_right_shift')
                 moredefs.append('NPY_DO_NOT_OPTIMIZE_ULONGLONG_right_shift')
 
-            # Py3K check
-            if sys.version_info[0] >= 3:
-                moredefs.append(('NPY_PY3K', 1))
-
             # Generate the config.h file from moredefs
             with open(target, 'w') as target_f:
                 for d in moredefs:
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
@@ -1314,18 +1314,9 @@ _convert_from_type(PyObject *obj) {
     if (PyType_IsSubtype(typ, &PyGenericArrType_Type)) {
         return PyArray_DescrFromTypeObject(obj);
     }
-#if !defined(NPY_PY3K)
-    else if (typ == &PyInt_Type) {
-        return PyArray_DescrFromType(NPY_LONG);
-    }
-    else if (typ == &PyLong_Type) {
-        return PyArray_DescrFromType(NPY_LONGLONG);
-    }
-#else
     else if (typ == &PyLong_Type) {
         return PyArray_DescrFromType(NPY_LONG);
     }
-#endif
     else if (typ == &PyFloat_Type) {
         return PyArray_DescrFromType(NPY_DOUBLE);
     }
@@ -1341,11 +1332,7 @@ _convert_from_type(PyObject *obj) {
     else if (typ == &PyUnicode_Type) {
         return PyArray_DescrFromType(NPY_UNICODE);
     }
-#if defined(NPY_PY3K)
     else if (typ == &PyMemoryView_Type) {
-#else
-    else if (typ == &PyBuffer_Type) {
-#endif
         return PyArray_DescrFromType(NPY_VOID);
     }
     else {
