diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-15 03:10:36 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-15 03:10:36 +0000 |
| commit | 0283b6f480b7239dc1390dadf29fcb5e1f2516e3 (patch) | |
| tree | 6d75e6fb25fb7ff9e5668df1dfad9c7edba7a00e /numpy/lib/index_tricks.py | |
| parent | d04bb02f393f0122e52b804bf548e0e18a0a2ecc (diff) | |
| download | numpy-0283b6f480b7239dc1390dadf29fcb5e1f2516e3.tar.gz | |
Moved .dtypedescr to .dtype; .dtype->.dtype.type; .dtypestr ->.dtype.str; .dtypechar -> .dtype.char
Diffstat (limited to 'numpy/lib/index_tricks.py')
| -rw-r--r-- | numpy/lib/index_tricks.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index b09538e42..fc06a2600 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -207,9 +207,9 @@ class concatenator(object): objs.append(newobj) if isinstance(newobj, _nx.ndarray) and not scalar: if final_dtypedescr is None: - final_dtypedescr = newobj.dtypedescr - elif newobj.dtypedescr > final_dtypedescr: - final_dtypedescr = newobj.dtypedescr + final_dtypedescr = newobj.dtype + elif newobj.dtype > final_dtypedescr: + final_dtypedescr = newobj.dtype if final_dtypedescr is not None: for k in scalars: objs[k] = objs[k].astype(final_dtypedescr) |