Author: oliphant
Date: 2007-05-16 02:10:37 -0500 (Wed, 16 May 2007)
New Revision: 3768
Modified:
trunk/numpy/core/src/arrayobject.c
Log:
Fixed a place where unicode itemsize was being counted twice. This led to array([u'abc'],'U') returning the wrong itemsize.
Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c 2007-05-15 23:23:57 UTC (rev 3767)
+++ trunk/numpy/core/src/arrayobject.c 2007-05-16 07:10:37 UTC (rev 3768)
@@ -6859,10 +6859,7 @@
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++) {