1 files changed, 22 insertions, 55 deletions

diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 8bab9008b..ad19f5b99 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -374,7 +374,7 @@ def ones(shape, dtype=int_, order='C'):
     return a
 
 def identity(n,dtype=int_):
-    """identity(n) returns the identity matrix of shape n x n.
+    """identity(n) returns the identity 2-d array of shape n x n.
     """
     a = array([1]+n*[0],dtype=dtype)
     b = empty((n,n),dtype=dtype)
@@ -394,36 +394,6 @@ def allclose (a, b, rtol=1.e-5, atol=1.e-8):
     d = less(absolute(x-y), atol + rtol * absolute(y))
     return d.ravel().all()
 
-def _setpyvals(lst, frame, where=0):
-    if not isinstance(lst, list) or len(lst) != 3:
-        raise ValueError, "Invalid pyvalues (length 3 list needed)."
-
-    try:
-        wh = where.lower()[0]
-    except (AttributeError, TypeError, IndexError):
-        wh = None
-
-    if where==0 or wh == 'l':
-        frame.f_locals[UFUNC_PYVALS_NAME] = lst
-    elif where == 1 or wh == 'g':
-        frame.f_globals[UFUNC_PYVALS_NAME] = lst
-    elif where == 2 or wh == 'b':
-        frame.f_builtins[UFUNC_PYVALS_NAME] = lst
-
-    umath.update_use_defaults()
-    return
-
-def _getpyvals(frame):
-    try:
-        return frame.f_locals[UFUNC_PYVALS_NAME]
-    except KeyError:
-        try:
-            return frame.f_globals[UFUNC_PYVALS_NAME]
-        except KeyError:
-            try:
-                return frame.f_builtins[UFUNC_PYVALS_NAME]
-            except KeyError:
-                return [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT, None]
 
 _errdict = {"ignore":ERR_IGNORE,
             "warn":ERR_WARN,
@@ -436,21 +406,21 @@ for key in _errdict.keys():
 del key
 
 def seterr(divide="ignore", over="ignore", under="ignore",
-           invalid="ignore", where=0):
+           invalid="ignore"):
+
     maskvalue = ((_errdict[divide] << SHIFT_DIVIDEBYZERO) +
                  (_errdict[over] << SHIFT_OVERFLOW ) +
                  (_errdict[under] << SHIFT_UNDERFLOW) +
                  (_errdict[invalid] << SHIFT_INVALID))
 
-    frame = sys._getframe().f_back
-    pyvals = _getpyvals(frame)
-    pyvals[1] = maskvalue
-    _setpyvals(pyvals, frame, where)
+    pyvals = umath.geterrlist()
+    old = pyvals[:]
+    pyvals[1] = maskvalue    
+    umath.seterrlist(pyvals)
+    return old
 
 def geterr():
-    frame = sys._getframe().f_back
-    maskvalue = _getpyvals(frame)[1]
-
+    maskvalue = umath.geterrlist()[1]
     mask = 3
     res = {}
     val = (maskvalue >> SHIFT_DIVIDEBYZERO) & mask
@@ -463,37 +433,34 @@ def geterr():
     res['invalid'] = _errdict_rev[val]
     return res
 
-def setbufsize(size, where=0):
+def setbufsize(size):
     if size > 10e6:
         raise ValueError, "Very big buffers.. %s" % size
 
-    frame = sys._getframe().f_back
-    pyvals = _getpyvals(frame)
+    pyvals = umath.geterrlist()
+    old = pyvals[:]
     pyvals[0] = size
-    _setpyvals(pyvals, frame, where)
+    umath.seterrlist(pyvals)
+    return old
 
 def getbufsize():
-    frame = sys._getframe().f_back
-    return _getpyvals(frame)[0]
+    return umath.geterrlist()[0]
 
-def seterrcall(func, where=0):
+def seterrcall(func):
     if not callable(func):
         raise ValueError, "Only callable can be used as callback"
-    frame = sys._getframe().f_back
-    pyvals = _getpyvals(frame)
+    pyvals = umath.geterrlist()
+    old = pyvals[:]
     pyvals[2] = func
-    _setpyvals(pyvals, frame, where)
+    umath.seterrlist(pyvals)
+    return old
 
 def geterrcall():
-    frame = sys._getframe().f_back
-    return _getpyvals(frame)[2]
+    return umath.geterrlist()[2]
 
 def _setdef():
-    frame = sys._getframe()
     defval = [UFUNC_BUFSIZE_DEFAULT, ERR_DEFAULT, None]
-    frame.f_globals[UFUNC_PYVALS_NAME] = defval
-    frame.f_builtins[UFUNC_PYVALS_NAME] = defval
-    umath.update_use_defaults()
+    umath.seterrlist(defval)
 
 # set the default values
 _setdef()