static allocation of boolean values

1 files changed, 2 insertions, 8 deletions

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 0207570da..fdd2cbe2b 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -810,14 +810,8 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
 	int swap;
 
 	type_num = descr->type_num;
-	/* XXX: Extra check is needed to allow this function to
-	   XXX: be called to initialize bool values. It would
-	   XXX: be better not to use this function in init. */
-	if (type_num == PyArray_BOOL && PyArrayScalar_True) {
-		int i = *(Bool*)data;
-		Py_INCREF(PyArrayScalar_BoolValues[i]);
-		return PyArrayScalar_BoolValues[i];
-	}
+	if (type_num == PyArray_BOOL)
+		PyArrayScalar_RETURN_BOOL_FROM_LONG(*(Bool*)data);
 	else if (type_num == PyArray_OBJECT) {
 		Py_INCREF(*((PyObject **)data));
 		return *((PyObject **)data);