diff options
Diffstat (limited to 'numpy/numarray')
| -rw-r--r-- | numpy/numarray/functions.py | 4 | ||||
| -rw-r--r-- | numpy/numarray/numerictypes.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py index 9b72a27e2..3f91046d2 100644 --- a/numpy/numarray/functions.py +++ b/numpy/numarray/functions.py @@ -31,14 +31,14 @@ import sys import math import operator +import numpy as np from numpy import dot as matrixmultiply, dot, vdot, ravel, concatenate, all,\ allclose, any, argsort, array_equal, array_equiv,\ array_str, array_repr, CLIP, RAISE, WRAP, clip, concatenate, \ diagonal, e, pi, inner as innerproduct, nonzero, \ outer as outerproduct, kron as kroneckerproduct, lexsort, putmask, rank, \ resize, searchsorted, shape, size, sort, swapaxes, trace, transpose -import numpy as np - +from numpy.compat import long from .numerictypes import typefrom if sys.version_info[0] >= 3: diff --git a/numpy/numarray/numerictypes.py b/numpy/numarray/numerictypes.py index caf40cf45..21685c34d 100644 --- a/numpy/numarray/numerictypes.py +++ b/numpy/numarray/numerictypes.py @@ -29,6 +29,8 @@ $Id: numerictypes.py,v 1.55 2005/12/01 16:22:03 jaytmiller Exp $ """ from __future__ import division, absolute_import, print_function +import numpy +from numpy.compat import long __all__ = ['NumericType','HasUInt64','typeDict','IsType', 'BooleanType', 'SignedType', 'UnsignedType', 'IntegralType', @@ -45,7 +47,6 @@ __all__ = ['NumericType','HasUInt64','typeDict','IsType', MAX_ALIGN = 8 MAX_INT_SIZE = 8 -import numpy LP64 = numpy.intp(0).itemsize == 8 HasUInt64 = 1 |