Merge pull request #8119 from behzadnouri/numpy-scalar

BUG: broadcasting with numpy scalars (GH8116)

Author: jreback

doc/source/v0.15.0.txt

@@ -628,7 +628,7 @@ Bug Fixes
   ``_read`` (:issue:`7927`).
 
 - Bug in ``DataFrame.stack()`` when one of the column levels was a datelike (:issue:`8039`)
-
+- Bug in broadcasting numpy scalars with DataFrames (:issue:`8116`)
 
 
 

pandas/core/ops.py

@@ -784,7 +784,7 @@ def f(self, other, axis=default_axis, level=None, fill_value=None):
                 # casted = self._constructor_sliced(other, index=self.columns)
                 casted = pd.Series(other, index=self.columns)
             return self._combine_series(casted, na_op, fill_value, axis, level)
-        elif isinstance(other, np.ndarray):
+        elif isinstance(other, np.ndarray) and other.ndim:  # skips np scalar
             if other.ndim == 1:
                 if axis is not None and self._get_axis_name(axis) == 'index':
                     # casted = self._constructor_sliced(other,

pandas/tests/test_frame.py

@@ -4712,6 +4712,19 @@ def test_operators(self):
         df = DataFrame({'a': ['a', None, 'b']})
         assert_frame_equal(df + df, DataFrame({'a': ['aa', np.nan, 'bb']}))
 
+    def test_ops_np_scalar(self):
+        vals, xs = np.random.rand(5, 3), [nan, 7, -23, 2.718, -3.14, np.inf]
+        f = lambda x: DataFrame(x, index=list('ABCDE'),
+                columns=['jim', 'joe', 'jolie'])
+
+        df = f(vals)
+
+        for x in xs:
+            assert_frame_equal(df / np.array(x), f(vals / x))
+            assert_frame_equal(np.array(x) * df, f(vals * x))
+            assert_frame_equal(df + np.array(x), f(vals + x))
+            assert_frame_equal(np.array(x) - df, f(x - vals))
+
     def test_operators_boolean(self):
 
         # GH 5808