@@ -622,39 +622,40 @@ def test_all_any_params(self):
622
622
self .assertRaises (NotImplementedError , s .all , bool_only = True )
623
623
624
624
def test_modulo (self ):
625
+ with np .errstate (all = 'ignore' ):
626
+
627
+ # GH3590, modulo as ints
628
+ p = DataFrame ({'first' : [3 , 4 , 5 , 8 ], 'second' : [0 , 0 , 0 , 3 ]})
629
+ result = p ['first' ] % p ['second' ]
630
+ expected = Series (p ['first' ].values % p ['second' ].values ,
631
+ dtype = 'float64' )
632
+ expected .iloc [0 :3 ] = np .nan
633
+ assert_series_equal (result , expected )
625
634
626
- # GH3590, modulo as ints
627
- p = DataFrame ({'first' : [3 , 4 , 5 , 8 ], 'second' : [0 , 0 , 0 , 3 ]})
628
- result = p ['first' ] % p ['second' ]
629
- expected = Series (p ['first' ].values % p ['second' ].values ,
630
- dtype = 'float64' )
631
- expected .iloc [0 :3 ] = np .nan
632
- assert_series_equal (result , expected )
633
-
634
- result = p ['first' ] % 0
635
- expected = Series (np .nan , index = p .index , name = 'first' )
636
- assert_series_equal (result , expected )
635
+ result = p ['first' ] % 0
636
+ expected = Series (np .nan , index = p .index , name = 'first' )
637
+ assert_series_equal (result , expected )
637
638
638
- p = p .astype ('float64' )
639
- result = p ['first' ] % p ['second' ]
640
- expected = Series (p ['first' ].values % p ['second' ].values )
641
- assert_series_equal (result , expected )
639
+ p = p .astype ('float64' )
640
+ result = p ['first' ] % p ['second' ]
641
+ expected = Series (p ['first' ].values % p ['second' ].values )
642
+ assert_series_equal (result , expected )
642
643
643
- p = p .astype ('float64' )
644
- result = p ['first' ] % p ['second' ]
645
- result2 = p ['second' ] % p ['first' ]
646
- self .assertFalse (np .array_equal (result , result2 ))
644
+ p = p .astype ('float64' )
645
+ result = p ['first' ] % p ['second' ]
646
+ result2 = p ['second' ] % p ['first' ]
647
+ self .assertFalse (np .array_equal (result , result2 ))
647
648
648
- # GH 9144
649
- s = Series ([0 , 1 ])
649
+ # GH 9144
650
+ s = Series ([0 , 1 ])
650
651
651
- result = s % 0
652
- expected = Series ([nan , nan ])
653
- assert_series_equal (result , expected )
652
+ result = s % 0
653
+ expected = Series ([nan , nan ])
654
+ assert_series_equal (result , expected )
654
655
655
- result = 0 % s
656
- expected = Series ([nan , 0.0 ])
657
- assert_series_equal (result , expected )
656
+ result = 0 % s
657
+ expected = Series ([nan , 0.0 ])
658
+ assert_series_equal (result , expected )
658
659
659
660
def test_ops_consistency_on_empty (self ):
660
661
0 commit comments