File tree Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -524,9 +524,8 @@ def test_setitem_boolean(self):
524
524
values [values == 2 ] = 3
525
525
assert_almost_equal (df .values , values )
526
526
527
- with tm .assert_raises_regex (TypeError , 'Must pass '
528
- 'DataFrame with '
529
- 'boolean values only' ):
527
+ msg = "Must pass DataFrame or 2-d ndarray with boolean values only"
528
+ with assertRaisesRegexp (TypeError , msg ):
530
529
df [df * 0 ] = 2
531
530
532
531
# index with DataFrame
@@ -539,8 +538,17 @@ def test_setitem_boolean(self):
539
538
# set from DataFrame
540
539
expected = df .copy ()
541
540
df [df > np .abs (df )] = df * 2
542
- np .putmask (expected .values , mask .values , df .values * 2 )
543
- assert_frame_equal (df , expected )
541
+ np .putmask (expected .values , mask .val
542
+
543
+ def test_setitem_boolean_ndarary (self ):
544
+ df = self .frame .copy ()
545
+ mask = df > np .abs (df )
546
+ expected = df .copy ()
547
+ expected .values [mask .values ] = nan
548
+ # index with 2-d boolean ndarray
549
+ actual = df .copy ()
550
+ actual [mask .values ] = nan
551
+ assert_frame_equal (actual , expected )
544
552
545
553
def test_setitem_cast (self ):
546
554
self .frame ['D' ] = self .frame ['D' ].astype ('i8' )
You can’t perform that action at this time.
0 commit comments