From 24caeed5a1dfc1a90cbfc27d0ac9c154cee0af58 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Mon, 26 May 2008 22:08:35 +0000 Subject: Fix regression in dtype='c' array creation. --- numpy/core/src/arrayobject.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'numpy/core/src/arrayobject.c') diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index cd934424d..7398a2263 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -13,7 +13,8 @@ Travis Oliphant, oliphant@ee.byu.edu Brigham Young Univeristy - maintainer email: oliphant.travis@ieee.org +:8613 +maintainer email: oliphant.travis@ieee.org Numarray design (which provided guidance) by Space Science Telescope Institute @@ -8801,7 +8802,7 @@ PyArray_FromAny(PyObject *op, PyArray_Descr *newtype, int min_depth, else if (newtype->type_num == PyArray_OBJECT) { isobject = 1; } - if (!PyString_Check(op) && PySequence_Check(op)) { + if (PySequence_Check(op)) { PyObject *thiserr = NULL; /* necessary but not sufficient */ -- cgit v1.2.1