summaryrefslogtreecommitdiff
path: root/scipy/base/chararray.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-12-05 20:58:31 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-12-05 20:58:31 +0000
commita13279edfc10f6e392bc01255b8daeb0fbf3e1ab (patch)
treed6efb92e7385136c7ead0f5dd9c0380c483cab83 /scipy/base/chararray.py
parenta7a0f136775df5fd838f7b1c151fc78629e49d97 (diff)
downloadnumpy-a13279edfc10f6e392bc01255b8daeb0fbf3e1ab.tar.gz
Fixtype branch tests level 1 pass.
Diffstat (limited to 'scipy/base/chararray.py')
-rw-r--r--scipy/base/chararray.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/scipy/base/chararray.py b/scipy/base/chararray.py
index 2d2c938b5..6a6195b04 100644
--- a/scipy/base/chararray.py
+++ b/scipy/base/chararray.py
@@ -19,10 +19,11 @@ class ndchararray(ndarray):
swap = 0
if buffer is None:
- self = ndarray.__new__(subtype, shape, dtype, itemlen,
+ self = ndarray.__new__(subtype, shape, (dtype, itemlen),
fortran=fortran)
else:
- self = ndarray.__new__(subtype, shape, dtype, itemlen, buffer=buffer,
+ self = ndarray.__new__(subtype, shape, (dtype, itemlen),
+ buffer=buffer,
offset=offset, strides=strides,
swap=swap, fortran=fortran)
return self
@@ -308,7 +309,7 @@ def chararray(obj, itemlen=7, copy=True, unicode=False, fortran=False):
if copy and not copied:
obj = obj.copy()
- return ndarray.__new__(ndchararray, obj.shape, dtype, itemlen,
+ return ndarray.__new__(ndchararray, obj.shape, (dtype, itemlen),
buffer=obj, offset=0, swap=obj.flags.swapped,
fortran=obj.flags['FNC'])