summaryrefslogtreecommitdiff
path: root/numpy/numarray
diff options
context:
space:
mode:
authornjsmith <njs@pobox.com>2013-07-11 15:54:49 -0700
committernjsmith <njs@pobox.com>2013-07-11 15:54:49 -0700
commite1c4806b649933383fb610205fb612c438360472 (patch)
tree91dc7b921171c1b5a0b0b4010669576bc7fc5dcf /numpy/numarray
parent12c5fc01e37d2235713c59ac0b1346294a8e8688 (diff)
parent28eadc0e31ca7aea5c679023d1e703856f45c879 (diff)
downloadnumpy-e1c4806b649933383fb610205fb612c438360472.tar.gz
Merge pull request #3516 from charris/remove-outdated-version-checks
MAINT: Remove outdated version checks.
Diffstat (limited to 'numpy/numarray')
-rw-r--r--numpy/numarray/_capi.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c
index 032379515..7320537a3 100644
--- a/numpy/numarray/_capi.c
+++ b/numpy/numarray/_capi.c
@@ -996,9 +996,7 @@ static PyTypeObject CfuncType = {
0, /* tp_subclasses */
0, /* tp_weaklist */
0, /* tp_del */
-#if PY_VERSION_HEX >= 0x02060000
0, /* tp_version_tag */
-#endif
};
/* CfuncObjects are created at the c-level only. They ensure that each
@@ -2250,11 +2248,9 @@ _NA_maxType(PyObject *seq, int limit)
}
return maxtype;
} else {
-#if PY_VERSION_HEX >= 0x02030000
if (PyBool_Check(seq))
return BOOL_SCALAR;
else
-#endif
#if defined(NPY_PY3K)
if (PyInt_Check(seq))
return INT_SCALAR;