diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-05 07:01:54 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-05 07:01:54 +0000 |
| commit | 0820b2a2c8cebe828c1a9faa1bef45a8b0421100 (patch) | |
| tree | a5292cafbeae38b4c42fbe65464741b33a1f4721 | |
| parent | 04d79b539391064f6a81fba9ffa45e6371ffcedd (diff) | |
| download | numpy-0820b2a2c8cebe828c1a9faa1bef45a8b0421100.tar.gz | |
Alter typeconv to ignore 'b'
| -rw-r--r-- | numpy/oldnumeric/typeconv.py | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/numpy/oldnumeric/typeconv.py b/numpy/oldnumeric/typeconv.py index ba036a35d..9e82b2619 100644 --- a/numpy/oldnumeric/typeconv.py +++ b/numpy/oldnumeric/typeconv.py @@ -5,32 +5,40 @@ import numpy as N oldtype2dtype = {'1': N.dtype(N.byte), 's': N.dtype(N.short), - 'i': N.dtype(N.intc), - 'l': N.dtype(int), - 'b': N.dtype(N.ubyte), +# 'i': N.dtype(N.intc), +# 'l': N.dtype(int), +# 'b': N.dtype(N.ubyte), 'w': N.dtype(N.ushort), 'u': N.dtype(N.uintc), - 'f': N.dtype(N.single), - 'd': N.dtype(float), - 'F': N.dtype(N.csingle), - 'D': N.dtype(complex), - 'O': N.dtype(object), - 'c': N.dtype('c'), +# 'f': N.dtype(N.single), +# 'd': N.dtype(float), +# 'F': N.dtype(N.csingle), +# 'D': N.dtype(complex), +# 'O': N.dtype(object), +# 'c': N.dtype('c'), None:N.dtype(int) } +# converts typecode=None to int def convtypecode(typecode, dtype=None): if dtype is None: try: return oldtype2dtype[typecode] except: return N.dtype(typecode) + else: + return dtype +#if both typecode and dtype are None +# return None def convtypecode2(typecode, dtype=None): - if typecode is None and dtype is None: - return None - elif dtype is None: - try: - return oldtype2dtype[typecode] - except: - return N.dtype(typecode) + if dtype is None: + if typecode is None: + return None + else: + try: + return oldtype2dtype[typecode] + except: + return N.dtype(typecode) + else: + return dtype |