From 4eb3bf56a0d3de3fb67fe6d3fcbd55e798ea4fca Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Thu, 17 May 2007 11:55:11 +0000
Subject: Fix ticekt #511 and start to handle allclose problems.

---
 numpy/core/src/arrayobject.c | 12 ++++++++++--
 1 file changed, 10 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 200100323..b5b39caad 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -6918,10 +6918,18 @@ _array_small_type(PyArray_Descr *chktype, PyArray_Descr* mintype)
                 return mintype;
         }
 
+
         if (chktype->type_num > mintype->type_num)
                 outtype_num = chktype->type_num;
-        else
-                outtype_num = mintype->type_num;
+        else {
+                if (PyDataType_ISOBJECT(chktype) && \
+                    PyDataType_ISSTRING(mintype)) {
+                        return PyArray_DescrFromType(NPY_OBJECT);
+                }
+                else {
+                        outtype_num = mintype->type_num;
+                }
+        }
 
         save_num = outtype_num;
         while(outtype_num < PyArray_NTYPES &&
-- 
cgit v1.2.1