From 448bb44cca09075c0281f0857109db3925908098 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Mon, 24 Apr 2006 20:44:33 +0000 Subject: Fix so USE_USE_DEFAULTS code works in multi-threaded case. Speed up 1-d array indexing by an integer. --- numpy/core/numeric.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'numpy/core/numeric.py') diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index f57527990..557c8e7f4 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -395,13 +395,6 @@ def allclose (a, b, rtol=1.e-5, atol=1.e-8): return d.ravel().all() -class ufunc_values_obj(object): - def __init__(self, obj): - self._val_obj = obj - def __del__(self): - umath.seterrobj(self._val_obj) - del self._val_obj - _errdict = {"ignore":ERR_IGNORE, "warn":ERR_WARN, @@ -413,11 +406,11 @@ for key in _errdict.keys(): _errdict_rev[_errdict[key]] = key del key -def seterr(divide=None, over=None, under=None, invalid=None): - +def seterr(divide=None, over=None, under=None, invalid=None): + pyvals = umath.geterrobj() - old = geterr() - + old = geterr() + if divide is None: divide = old['divide'] if over is None: over = old['over'] if under is None: under = old['under'] -- cgit v1.2.1