Skip to content

Commit 698a4c2

Browse files
DOC: Added series operation name/example to flex_doc and made naming consistent
1 parent 93e8cf5 commit 698a4c2

File tree

1 file changed

+33
-17
lines changed

1 file changed

+33
-17
lines changed

pandas/core/ops.py

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ def make_invalid_op(name):
211211
-------
212212
invalid_op : function
213213
"""
214+
214215
def invalid_op(self, other=None):
215216
raise TypeError("cannot perform {name} with this index type: "
216217
"{typ}".format(name=name, typ=type(self).__name__))
@@ -486,7 +487,7 @@ def _get_op_name(op, special):
486487
e NaN -4.0 NaN
487488
"""
488489

489-
_mul_example_FRAME = """
490+
_mul_example_SERIES = """
490491
>>> a = pd.Series([1, 1, 1, np.nan], index=['a', 'b', 'c', 'd'])
491492
>>> a
492493
a 1.0
@@ -515,61 +516,75 @@ def _get_op_name(op, special):
515516
'add': {'op': '+',
516517
'desc': 'Addition',
517518
'reverse': 'radd',
518-
'df_examples': _add_example_FRAME},
519+
'df_examples': _add_example_FRAME,
520+
'series_examples': None},
519521
'sub': {'op': '-',
520522
'desc': 'Subtraction',
521523
'reverse': 'rsub',
522-
'df_examples': _sub_example_FRAME},
524+
'df_examples': _sub_example_FRAME,
525+
'series_examples': None},
523526
'mul': {'op': '*',
524527
'desc': 'Multiplication',
525528
'reverse': 'rmul',
526-
'df_examples': _mul_example_FRAME},
529+
'df_examples': None,
530+
'series_examples': _mul_example_SERIES},
527531
'mod': {'op': '%',
528532
'desc': 'Modulo',
529533
'reverse': 'rmod',
530-
'df_examples': _mod_example_FRAME},
534+
'df_examples': _mod_example_FRAME,
535+
'series_examples': None},
531536
'pow': {'op': '**',
532537
'desc': 'Exponential power',
533538
'reverse': 'rpow',
534-
'df_examples': None},
539+
'df_examples': None,
540+
'series_examples': None},
535541
'truediv': {'op': '/',
536542
'desc': 'Floating division',
537543
'reverse': 'rtruediv',
538-
'df_examples': None},
544+
'df_examples': None,
545+
'series_examples': None},
539546
'floordiv': {'op': '//',
540547
'desc': 'Integer division',
541548
'reverse': 'rfloordiv',
542-
'df_examples': None},
549+
'df_examples': None,
550+
'series_examples': None},
543551
'divmod': {'op': 'divmod',
544552
'desc': 'Integer division and modulo',
545553
'reverse': None,
546-
'df_examples': None},
554+
'df_examples': None,
555+
'series_examples': None},
547556

548557
# Comparison Operators
549558
'eq': {'op': '==',
550559
'desc': 'Equal to',
551560
'reverse': None,
552-
'df_examples': None},
561+
'df_examples': None,
562+
'series_examples': None},
553563
'ne': {'op': '!=',
554564
'desc': 'Not equal to',
555565
'reverse': None,
556-
'df_examples': None},
566+
'df_examples': None,
567+
'series_examples': None},
557568
'lt': {'op': '<',
558569
'desc': 'Less than',
559570
'reverse': None,
560-
'df_examples': None},
571+
'df_examples': None,
572+
'series_examples': None},
561573
'le': {'op': '<=',
562574
'desc': 'Less than or equal to',
563575
'reverse': None,
564-
'df_examples': None},
576+
'df_examples': None,
577+
'series_examples': None},
565578
'gt': {'op': '>',
566579
'desc': 'Greater than',
567580
'reverse': None,
568-
'df_examples': None},
581+
'df_examples': None,
582+
'series_examples': None},
569583
'ge': {'op': '>=',
570584
'desc': 'Greater than or equal to',
571585
'reverse': None,
572-
'df_examples': None}}
586+
'df_examples': None,
587+
'series_examples': None}}
573588

574589
_op_names = list(_op_descriptions.keys())
575590
for key in _op_names:
@@ -604,7 +619,7 @@ def _get_op_name(op, special):
604619
605620
Examples
606621
--------
607-
{df_examples}
622+
{series_examples}
608623
609624
See also
610625
--------
@@ -737,7 +752,7 @@ def _make_flex_doc(op_name, typ):
737752
base_doc = _flex_doc_SERIES
738753
doc = base_doc.format(desc=op_desc['desc'], op_name=op_name,
739754
equiv=equiv, reverse=op_desc['reverse'],
740-
df_examples=op_desc['df_examples'])
755+
series_examples=op_desc['series_examples'])
741756
elif typ == 'dataframe':
742757
base_doc = _flex_doc_FRAME
743758
doc = base_doc.format(desc=op_desc['desc'], op_name=op_name,
@@ -1091,6 +1106,7 @@ def add_special_arithmetic_methods(cls):
10911106
_, _, arith_method, comp_method, bool_method = _get_method_wrappers(cls)
10921107
new_methods = _create_methods(cls, arith_method, comp_method, bool_method,
10931108
special=True)
1109+
10941110
# inplace operators (I feel like these should get passed an `inplace=True`
10951111
# or just be removed
10961112

0 commit comments

Comments
 (0)