@@ -211,6 +211,7 @@ def make_invalid_op(name):
211
211
-------
212
212
invalid_op : function
213
213
"""
214
+
214
215
def invalid_op (self , other = None ):
215
216
raise TypeError ("cannot perform {name} with this index type: "
216
217
"{typ}" .format (name = name , typ = type (self ).__name__ ))
@@ -486,7 +487,7 @@ def _get_op_name(op, special):
486
487
e NaN -4.0 NaN
487
488
"""
488
489
489
- _mul_example_FRAME = """
490
+ _mul_example_SERIES = """
490
491
>>> a = pd.Series([1, 1, 1, np.nan], index=['a', 'b', 'c', 'd'])
491
492
>>> a
492
493
a 1.0
@@ -515,61 +516,75 @@ def _get_op_name(op, special):
515
516
'add' : {'op' : '+' ,
516
517
'desc' : 'Addition' ,
517
518
'reverse' : 'radd' ,
518
- 'df_examples' : _add_example_FRAME },
519
+ 'df_examples' : _add_example_FRAME ,
520
+ 'series_examples' : None },
519
521
'sub' : {'op' : '-' ,
520
522
'desc' : 'Subtraction' ,
521
523
'reverse' : 'rsub' ,
522
- 'df_examples' : _sub_example_FRAME },
524
+ 'df_examples' : _sub_example_FRAME ,
525
+ 'series_examples' : None },
523
526
'mul' : {'op' : '*' ,
524
527
'desc' : 'Multiplication' ,
525
528
'reverse' : 'rmul' ,
526
- 'df_examples' : _mul_example_FRAME },
529
+ 'df_examples' : None ,
530
+ 'series_examples' : _mul_example_SERIES },
527
531
'mod' : {'op' : '%' ,
528
532
'desc' : 'Modulo' ,
529
533
'reverse' : 'rmod' ,
530
- 'df_examples' : _mod_example_FRAME },
534
+ 'df_examples' : _mod_example_FRAME ,
535
+ 'series_examples' : None },
531
536
'pow' : {'op' : '**' ,
532
537
'desc' : 'Exponential power' ,
533
538
'reverse' : 'rpow' ,
534
- 'df_examples' : None },
539
+ 'df_examples' : None ,
540
+ 'series_examples' : None },
535
541
'truediv' : {'op' : '/' ,
536
542
'desc' : 'Floating division' ,
537
543
'reverse' : 'rtruediv' ,
538
- 'df_examples' : None },
544
+ 'df_examples' : None ,
545
+ 'series_examples' : None },
539
546
'floordiv' : {'op' : '//' ,
540
547
'desc' : 'Integer division' ,
541
548
'reverse' : 'rfloordiv' ,
542
- 'df_examples' : None },
549
+ 'df_examples' : None ,
550
+ 'series_examples' : None },
543
551
'divmod' : {'op' : 'divmod' ,
544
552
'desc' : 'Integer division and modulo' ,
545
553
'reverse' : None ,
546
- 'df_examples' : None },
554
+ 'df_examples' : None ,
555
+ 'series_examples' : None },
547
556
548
557
# Comparison Operators
549
558
'eq' : {'op' : '==' ,
550
559
'desc' : 'Equal to' ,
551
560
'reverse' : None ,
552
- 'df_examples' : None },
561
+ 'df_examples' : None ,
562
+ 'series_examples' : None },
553
563
'ne' : {'op' : '!=' ,
554
564
'desc' : 'Not equal to' ,
555
565
'reverse' : None ,
556
- 'df_examples' : None },
566
+ 'df_examples' : None ,
567
+ 'series_examples' : None },
557
568
'lt' : {'op' : '<' ,
558
569
'desc' : 'Less than' ,
559
570
'reverse' : None ,
560
- 'df_examples' : None },
571
+ 'df_examples' : None ,
572
+ 'series_examples' : None },
561
573
'le' : {'op' : '<=' ,
562
574
'desc' : 'Less than or equal to' ,
563
575
'reverse' : None ,
564
- 'df_examples' : None },
576
+ 'df_examples' : None ,
577
+ 'series_examples' : None },
565
578
'gt' : {'op' : '>' ,
566
579
'desc' : 'Greater than' ,
567
580
'reverse' : None ,
568
- 'df_examples' : None },
581
+ 'df_examples' : None ,
582
+ 'series_examples' : None },
569
583
'ge' : {'op' : '>=' ,
570
584
'desc' : 'Greater than or equal to' ,
571
585
'reverse' : None ,
572
- 'df_examples' : None }}
586
+ 'df_examples' : None ,
587
+ 'series_examples' : None }}
573
588
574
589
_op_names = list (_op_descriptions .keys ())
575
590
for key in _op_names :
@@ -604,7 +619,7 @@ def _get_op_name(op, special):
604
619
605
620
Examples
606
621
--------
607
- {df_examples }
622
+ {series_examples }
608
623
609
624
See also
610
625
--------
@@ -737,7 +752,7 @@ def _make_flex_doc(op_name, typ):
737
752
base_doc = _flex_doc_SERIES
738
753
doc = base_doc .format (desc = op_desc ['desc' ], op_name = op_name ,
739
754
equiv = equiv , reverse = op_desc ['reverse' ],
740
- df_examples = op_desc ['df_examples ' ])
755
+ series_examples = op_desc ['series_examples ' ])
741
756
elif typ == 'dataframe' :
742
757
base_doc = _flex_doc_FRAME
743
758
doc = base_doc .format (desc = op_desc ['desc' ], op_name = op_name ,
@@ -1091,6 +1106,7 @@ def add_special_arithmetic_methods(cls):
1091
1106
_ , _ , arith_method , comp_method , bool_method = _get_method_wrappers (cls )
1092
1107
new_methods = _create_methods (cls , arith_method , comp_method , bool_method ,
1093
1108
special = True )
1109
+
1094
1110
# inplace operators (I feel like these should get passed an `inplace=True`
1095
1111
# or just be removed
1096
1112
0 commit comments