Merge pull request #4073 from cpcloud/internals-mask-edge-case

BUG: fix 1xN mask on 1xN frame

Author: cpcloud

doc/source/release.rst

@@ -293,6 +293,8 @@ pandas 0.12
     :issue:`4028`, :issue:`4054`)
   - ``Series.hist`` will now take the figure from the current environment if
     one is not passed
+  - Fixed bug where a 1xN DataFrame would barf on a 1xN mask (:issue:`4071`)
+
 
 pandas 0.11.0
 =============

doc/source/v0.12.0.txt

@@ -436,6 +436,7 @@ Bug Fixes
     :issue:`4028`, :issue:`4054`)
   - ``Series.hist`` will now take the figure from the current environment if
     one is not passed
+  - Fixed bug where a 1xN DataFrame would barf on a 1xN mask (:issue:`4071`)
 
 See the :ref:`full release notes
 <release>` or issue tracker

pandas/core/internals.py

@@ -575,9 +575,10 @@ def func(c,v,o):
             return make_block(result, self.items, self.ref_items)
 
         # might need to separate out blocks
-        axis = cond.ndim-1
-        cond = cond.swapaxes(axis,0)
-        mask = np.array([ cond[i].all() for i in enumerate(range(cond.shape[0]))],dtype=bool)
+        axis = cond.ndim - 1
+        cond = cond.swapaxes(axis, 0)
+        mask = np.array([cond[i].all() for i in xrange(cond.shape[0])],
+                        dtype=bool)
 
         result_blocks = []
         for m in [mask, ~mask]:

pandas/tests/test_frame.py

@@ -7695,6 +7695,13 @@ def test_mask(self):
         assert_frame_equal(rs, df.mask(df <= 0))
         assert_frame_equal(rs, df.mask(~cond))
 
+    def test_mask_edge_case_1xN_frame(self):
+        # GH4071
+        df = DataFrame([[1, 2]])
+        res = df.mask(DataFrame([[True, False]]))
+        expec = DataFrame([[nan, 2]])
+        assert_frame_equal(res, expec)
+
     #----------------------------------------------------------------------
     # Transposing
     def test_transpose(self):