From 2ebf198dfa4ea33c787bfca05267af93e27f08ea Mon Sep 17 00:00:00 2001 From: m-d-w Date: Thu, 6 Jun 2013 16:39:05 -0400 Subject: [PATCH] ENH: Optimize array creation by avoiding errors --- numpy/core/src/multiarray/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/numpy/core/src/multiarray/common.h b/numpy/core/src/multiarray/common.h index d771e753687f..3fca0b769afd 100644 --- a/numpy/core/src/multiarray/common.h +++ b/numpy/core/src/multiarray/common.h @@ -25,7 +25,7 @@ NPY_NO_EXPORT int PyArray_DTypeFromObjectHelper(PyObject *obj, int maxdims, PyArray_Descr **out_dtype, int string_status); -#define SUPPORTS_BUFFER_PROTOCOL(op) ( (Py_TYPE(op) != &PyList_Type) && (Py_None != op) || (Py_TYPE(op) != &PyTuple_Type) ) +#define SUPPORTS_BUFFER_PROTOCOL(op) ((Py_TYPE(op) != &PyList_Type) && (Py_None != op) && (Py_TYPE(op) != &PyTuple_Type)) NPY_NO_EXPORT PyObject * PyArray_GetAttrString_Lite(PyObject *v, char *name);