diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-09-28 20:26:19 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-09-28 20:26:19 +0000 |
| commit | b60f3c5f424f20d6e7506db7a4f26dfc3c08fe2e (patch) | |
| tree | c850314dbad46571f96635a22923e1d2605c235b /scipy/base/numeric.py | |
| parent | 07a2484e565aeb05a93b0b716160524b42032ab5 (diff) | |
| download | numpy-b60f3c5f424f20d6e7506db7a4f26dfc3c08fe2e.tar.gz | |
Don't shadow builtins anymore.
Diffstat (limited to 'scipy/base/numeric.py')
| -rw-r--r-- | scipy/base/numeric.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py index 9683a4d4c..b095ec800 100644 --- a/scipy/base/numeric.py +++ b/scipy/base/numeric.py @@ -179,8 +179,8 @@ def cross(a, b, axisa=-1, axisb=-1, axisc=-1): #Use numarray's printing function from arrayprint import array2string, get_printoptions, set_printoptions -_typelessdata = [int, float, complex] -if issubclass(intc, pyint): +_typelessdata = [aint, afloat, acomplex] +if issubclass(intc, int): _typelessdata.append(intc) def array_repr(arr, max_line_width=None, precision=None, suppress_small=None): |