diff options
| -rw-r--r-- | numpy/core/arrayprint.py | 4 | ||||
| -rw-r--r-- | numpy/core/numeric.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index fb83af3fb..c8d4e13f7 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -13,7 +13,6 @@ __docformat__ = 'restructuredtext' # and by Travis Oliphant 2005-8-22 for numpy import sys -import numeric as _nc import numerictypes as _nt from umath import maximum, minimum, absolute, not_equal, isnan, isinf from multiarray import format_longfloat @@ -142,6 +141,7 @@ def get_printoptions(): return d def _leading_trailing(a): + import numeric as _nc if a.ndim == 1: if len(a) > 2*_summaryEdgeItems: b = _nc.concatenate((a[:_summaryEdgeItems], @@ -224,6 +224,7 @@ def _array2string(a, max_line_width, precision, suppress_small, separator=' ', return lst def _convert_arrays(obj): + import numeric as _nc newtup = [] for k in obj: if isinstance(k, _nc.ndarray): @@ -386,6 +387,7 @@ class FloatFormat(object): self.fillFormat(data) def fillFormat(self, data): + import numeric as _nc errstate = _nc.seterr(all='ignore') try: special = isnan(data) | isinf(data) diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index be10d5005..dd3ee1de5 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -1728,7 +1728,7 @@ def base_repr (number, base=2, padding=0): from cPickle import load, loads _cload = load -_file = file +_file = open def load(file): """ |