From 07b1228e1e45d8f4d4e6c74520cc6106515638ba Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Wed, 16 May 2007 07:10:37 +0000
Subject: Fixed a place where unicode itemsize was being counted twice.  This
 led to array([u'abc'],'U') returning the wrong itemsize.

---
 numpy/core/src/arrayobject.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'numpy/core/src/arrayobject.c')

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 3e4e7f666..200100323 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -6859,10 +6859,7 @@ discover_itemsize(PyObject *s, int nd, int *itemsize)
 
         if ((nd == 0) || PyString_Check(s) ||           \
             PyUnicode_Check(s) || PyBuffer_Check(s)) {
-                if PyUnicode_Check(s)
-                        *itemsize = MAX(*itemsize, 4*n);
-                else
-                        *itemsize = MAX(*itemsize, n);
+                *itemsize = MAX(*itemsize, n);
                 return 0;
         }
         for (i=0; i<n; i++) {
-- 
cgit v1.2.1