@@ -96,10 +96,10 @@ def _constructor(self):
96
96
97
97
def test_flex_add_scalar_fill_value (self ):
98
98
# GH12723
99
- s = Series ([0 , 1 , np .nan , 3 , 4 , 5 ])
99
+ ser = Series ([0 , 1 , np .nan , 3 , 4 , 5 ])
100
100
101
- exp = s .fillna (0 ).add (2 )
102
- res = s .add (2 , fill_value = 0 )
101
+ exp = ser .fillna (0 ).add (2 )
102
+ res = ser .add (2 , fill_value = 0 )
103
103
tm .assert_series_equal (res , exp )
104
104
105
105
pairings = [(Series .div , operator .truediv , 1 ), (Series .rdiv , ops .rtruediv , 1 )]
@@ -226,12 +226,12 @@ def test_add_na_handling(self):
226
226
from datetime import date
227
227
from decimal import Decimal
228
228
229
- s = Series (
229
+ ser = Series (
230
230
[Decimal ("1.3" ), Decimal ("2.3" )], index = [date (2012 , 1 , 1 ), date (2012 , 1 , 2 )]
231
231
)
232
232
233
- result = s + s .shift (1 )
234
- result2 = s .shift (1 ) + s
233
+ result = ser + ser .shift (1 )
234
+ result2 = ser .shift (1 ) + ser
235
235
assert isna (result [0 ])
236
236
assert isna (result2 [0 ])
237
237
@@ -399,15 +399,12 @@ def test_ser_flex_cmp_return_dtypes_empty(self, opname):
399
399
expected = np .dtype ("bool" )
400
400
assert result == expected
401
401
402
- @pytest .mark .parametrize (
403
- "op" ,
404
- [operator .eq , operator .ne , operator .le , operator .lt , operator .ge , operator .gt ],
405
- )
406
402
@pytest .mark .parametrize (
407
403
"names" , [(None , None , None ), ("foo" , "bar" , None ), ("baz" , "baz" , "baz" )]
408
404
)
409
- def test_ser_cmp_result_names (self , names , op ):
405
+ def test_ser_cmp_result_names (self , names , comparison_op ):
410
406
# datetime64 dtype
407
+ op = comparison_op
411
408
dti = date_range ("1949-06-07 03:00:00" , freq = "H" , periods = 5 , name = names [0 ])
412
409
ser = Series (dti ).rename (names [1 ])
413
410
result = op (ser , dti )
@@ -583,9 +580,10 @@ def test_comparison_tuples(self):
583
580
expected = Series ([False , False ])
584
581
tm .assert_series_equal (result , expected )
585
582
586
- s = Series ([frozenset ([1 ]), frozenset ([1 , 2 ])])
583
+ def test_comparison_frozenset (self ):
584
+ ser = Series ([frozenset ([1 ]), frozenset ([1 , 2 ])])
587
585
588
- result = s == frozenset ([1 ])
586
+ result = ser == frozenset ([1 ])
589
587
expected = Series ([True , False ])
590
588
tm .assert_series_equal (result , expected )
591
589
@@ -649,8 +647,8 @@ def test_comp_ops_df_compat(self, left, right, frame_or_series):
649
647
650
648
def test_compare_series_interval_keyword (self ):
651
649
# GH#25338
652
- s = Series (["IntervalA" , "IntervalB" , "IntervalC" ])
653
- result = s == "IntervalA"
650
+ ser = Series (["IntervalA" , "IntervalB" , "IntervalC" ])
651
+ result = ser == "IntervalA"
654
652
expected = Series ([True , False , False ])
655
653
tm .assert_series_equal (result , expected )
656
654
@@ -662,19 +660,6 @@ def test_compare_series_interval_keyword(self):
662
660
663
661
664
662
class TestTimeSeriesArithmetic :
665
- # TODO: De-duplicate with test below
666
- def test_series_add_tz_mismatch_converts_to_utc_duplicate (self ):
667
- rng = date_range ("1/1/2011" , periods = 10 , freq = "H" , tz = "US/Eastern" )
668
- ser = Series (np .random .randn (len (rng )), index = rng )
669
-
670
- ts_moscow = ser .tz_convert ("Europe/Moscow" )
671
-
672
- result = ser + ts_moscow
673
- assert result .index .tz is pytz .utc
674
-
675
- result = ts_moscow + ser
676
- assert result .index .tz is pytz .utc
677
-
678
663
def test_series_add_tz_mismatch_converts_to_utc (self ):
679
664
rng = date_range ("1/1/2011" , periods = 100 , freq = "H" , tz = "utc" )
680
665
@@ -697,16 +682,6 @@ def test_series_add_tz_mismatch_converts_to_utc(self):
697
682
assert result .index .tz == pytz .UTC
698
683
tm .assert_series_equal (result , expected )
699
684
700
- # TODO: redundant with test_series_add_tz_mismatch_converts_to_utc?
701
- def test_series_arithmetic_mismatched_tzs_convert_to_utc (self ):
702
- base = pd .DatetimeIndex (["2011-01-01" , "2011-01-02" , "2011-01-03" ], tz = "UTC" )
703
- idx1 = base .tz_convert ("Asia/Tokyo" )[:2 ]
704
- idx2 = base .tz_convert ("US/Eastern" )[1 :]
705
-
706
- res = Series ([1 , 2 ], index = idx1 ) + Series ([1 , 1 ], index = idx2 )
707
- expected = Series ([np .nan , 3 , np .nan ], index = base )
708
- tm .assert_series_equal (res , expected )
709
-
710
685
def test_series_add_aware_naive_raises (self ):
711
686
rng = date_range ("1/1/2011" , periods = 10 , freq = "H" )
712
687
ser = Series (np .random .randn (len (rng )), index = rng )
@@ -871,20 +846,20 @@ def test_none_comparison(series_with_simple_index):
871
846
series .iloc [0 ] = np .nan
872
847
873
848
# noinspection PyComparisonWithNone
874
- result = series == None # noqa
849
+ result = series == None # noqa:E711
875
850
assert not result .iat [0 ]
876
851
assert not result .iat [1 ]
877
852
878
853
# noinspection PyComparisonWithNone
879
- result = series != None # noqa
854
+ result = series != None # noqa:E711
880
855
assert result .iat [0 ]
881
856
assert result .iat [1 ]
882
857
883
- result = None == series # noqa
858
+ result = None == series # noqa:E711
884
859
assert not result .iat [0 ]
885
860
assert not result .iat [1 ]
886
861
887
- result = None != series # noqa
862
+ result = None != series # noqa:E711
888
863
assert result .iat [0 ]
889
864
assert result .iat [1 ]
890
865
0 commit comments