np.rescale: remove redundant out= argument

kernc · kernc · commit 967809c085e8 · 2018-03-30T03:39:53.000+02:00
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
@@ -4401,7 +4401,7 @@ def append(arr, values, axis=None):
 
 
 def rescale(arr, out_min=0, out_max=1, in_min=None, in_max=None,
-            axis=None, return_params=False, out=None):
+            axis=None, return_params=False):
     """Linearly scale non-NaN values in array to the specified interval.
 
     .. versionadded:: 1.15.0
@@ -4431,8 +4431,6 @@ def rescale(arr, out_min=0, out_max=1, in_min=None, in_max=None,
         If True, also return `offset` and `scale` parameters so that
         ``offset + scale * x`` maps ``x`` from input interval onto
         output interval.
-    out : array_like, optional
-        Array of the same shape as `arr`, in which to store the result.
 
     Returns
     -------
@@ -4483,11 +4481,6 @@ def rescale(arr, out_min=0, out_max=1, in_min=None, in_max=None,
 
     res = arr * scale + offset
 
-    if out is None:
-        out = res
-    else:
-        out[...] = res
-
     if return_params:
-        return out, offset, scale
-    return out
+        return res, offset, scale
+    return res
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
@@ -3030,11 +3030,6 @@ def test_return_params(self):
         assert_equal(offset, np.c_[0, -2/3].T)
         assert_equal(scale, np.c_[1/3, 1/3].T)
 
-    def test_out(self):
-        out = np.zeros_like(self.arr)
-        assert_equal(rescale(self.arr, self.arr.min(), self.arr.max(), out=out),
-                     self.arr)
-
     def test_nan(self):
         arr = np.array([[1, 2],
                         [1, 1]])
