Skip to content

Commit bf123bd

Browse files
committed
fixed PEP8 and moved See Also above Examples
1 parent 52955a3 commit bf123bd

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

pandas/core/series.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"""
44
from __future__ import division
55

6+
# pylint: disable=E1101,E1103combine
7+
# pylint: disable=W0703,W0622,W0613,W0201
8+
9+
import warnings
610
from textwrap import dedent
711
import warnings
812

@@ -2287,7 +2291,7 @@ def combine(self, other, func, fill_value=None):
22872291
selection for combined Series.
22882292
`fill_value` is assumed when value is missing from one
22892293
of the two objects being combined at some index.
2290-
2294+
22912295
Parameters
22922296
----------
22932297
other : Series or scalar
@@ -2302,7 +2306,12 @@ def combine(self, other, func, fill_value=None):
23022306
Returns
23032307
-------
23042308
Series
2305-
A combined Series object.
2309+
A combined Series object.
2310+
2311+
See Also
2312+
--------
2313+
Series.combine_first : Combine Series values, choosing the calling
2314+
Series' values first
23062315
23072316
Examples
23082317
--------
@@ -2332,11 +2341,6 @@ def combine(self, other, func, fill_value=None):
23322341
23332342
If `func` doesn't get a value from either of the two Series,
23342343
fill_value` is used.
2335-
2336-
See Also
2337-
--------
2338-
Series.combine_first : Combine Series values, choosing the calling
2339-
Series' values first
23402344
"""
23412345
if fill_value is None:
23422346
fill_value = na_value_for_dtype(self.dtype, compat=False)

0 commit comments

Comments
 (0)