Merge pull request numpy#7505 from ahaldane/fixup_7382

charris · charris · commit 9c59de6e5771 · 2016-04-04T21:52:28.000-06:00
MAIN: fix to numpy#7382, make scl in np.average writeable
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
@@ -1027,7 +1027,8 @@ def average(a, axis=None, weights=None, returned=False):
         avg = np.multiply(a, wgt, dtype=result_dtype).sum(axis)/scl
 
     if returned:
-        scl = np.broadcast_to(scl, avg.shape)
+        if scl.shape != avg.shape:
+            scl = np.broadcast_to(scl, avg.shape).copy()
         return avg, scl
     else:
         return avg
