summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorArink Verma <arinkverma@gmail.com>2013-05-04 01:03:40 +0530
committerArink Verma <arinkverma@gmail.com>2013-05-04 01:03:40 +0530
commit7d8069760ba0638b5330827fede66af2fc72750b (patch)
tree1db5ac3fb748ec999cb6ad8dcde9f63d73282c4a /numpy
parentf817e761bad00895d9fe96fb1514bbf71d9fde57 (diff)
downloadnumpy-7d8069760ba0638b5330827fede66af2fc72750b.tar.gz
MAINT: Remove unneeded version check from multiarray/common.c.
A version check for Python >= 2.6 is no longer needed as versions < 2.6 are no longer supported.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/common.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c
index f0a6a761c..4f25dc913 100644
--- a/numpy/core/src/multiarray/common.c
+++ b/numpy/core/src/multiarray/common.c
@@ -147,9 +147,7 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,
int i, size;
PyArray_Descr *dtype = NULL;
PyObject *ip;
-#if PY_VERSION_HEX >= 0x02060000
Py_buffer buffer_view;
-#endif
/* Check if it's an ndarray */
if (PyArray_Check(obj)) {
@@ -309,7 +307,6 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,
goto promote_types;
}
-#if PY_VERSION_HEX >= 0x02060000
/* PEP 3118 buffer interface */
memset(&buffer_view, 0, sizeof(Py_buffer));
if (PyObject_GetBuffer(obj, &buffer_view, PyBUF_FORMAT|PyBUF_STRIDES) == 0 ||
@@ -334,7 +331,6 @@ PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims,
else {
PyErr_Clear();
}
-#endif
/* The array interface */
ip = PyObject_GetAttrString(obj, "__array_interface__");