Do __finalize__ in _construct_result and refactor previous solution.

Signed-off-by: HE, Tao <[email protected]>

Author: sighingnow

doc/source/whatsnew/v0.24.2.rst

@@ -31,7 +31,7 @@ Fixed Regressions
 - Fixed regression in ``IntervalDtype`` construction where passing an incorrect string with 'Interval' as a prefix could result in a ``RecursionError``. (:issue:`25338`)
 - Fixed regression in :class:`Categorical`, where constructing it from a categorical ``Series`` and an explicit ``categories=`` that differed from that in the ``Series`` created an invalid object which could trigger segfaults. (:issue:`25318`)
 - Fixed pip installing from source into an environment without NumPy (:issue:`25193`)
-- Fixed bug in :meth:`Series._binop` to handle binary operators that returns more than one :class:`Series` correctly (:issue:`25557`)
+- Fixed bug in :meth:`Series.divmod` and :meth:`Series.rdivmod` (:issue:`25557`)
 
 .. _whatsnew_0242.enhancements:
 

pandas/core/ops.py

@@ -1494,18 +1494,20 @@ def _construct_result(left, result, index, name, dtype=None):
     not be enough; we still need to override the name attribute.
     """
     out = left._constructor(result, index=index, dtype=dtype)
-
-    out.name = name
+    out.__finalize__(left)
+    if name is None:
+        out.name = name
     return out
 
 
 def _construct_divmod_result(left, result, index, name, dtype=None):
     """divmod returns a tuple of like indexed series instead of a single series.
     """
-    constructor = left._constructor
     return (
-        constructor(result[0], index=index, name=name, dtype=dtype),
-        constructor(result[1], index=index, name=name, dtype=dtype),
+        _construct_result(left, result[0], index=index, name=name,
+                          dtype=dtype),
+        _construct_result(left, result[1], index=index, name=name,
+                          dtype=dtype),
     )
 
 

pandas/core/series.py

@@ -2503,14 +2503,6 @@ def _binop(self, other, func, level=None, fill_value=None):
         Series
         """
 
-        def mk_ret(result, new_index, name):
-            ret = self._constructor(result, index=new_index, name=name)
-            ret.__finalize__(self)
-            if name is None:
-                # When name is None, __finalize__ overwrites current name
-                ret.name = None
-            return ret
-
         if not isinstance(other, Series):
             raise AssertionError('Other operand must be Series')
 
@@ -2527,14 +2519,13 @@ def mk_ret(result, new_index, name):
 
         with np.errstate(all='ignore'):
             result = func(this_vals, other_vals)
+
         name = ops.get_op_result_name(self, other)
-        if isinstance(result, tuple):
-            final_result = ()
-            for r in result:
-                final_result = (*final_result, mk_ret(r, new_index, name))
+        if func.__name__ in ['divmod', 'rdivmod']:
+            ret = ops._construct_divmod_result(self, result, new_index, name)
         else:
-            final_result = mk_ret(result, new_index, name)
-        return final_result
+            ret = ops._construct_result(self, result, new_index, name)
+        return ret
 
     def combine(self, other, func, fill_value=None):
         """

pandas/tests/series/test_operators.py

@@ -742,6 +742,7 @@ def test_op_duplicate_index(self):
         assert_series_equal(result, expected)
 
     def test_divmod(self):
+        # GH25557
         a = Series([1, 1, 1, np.nan], index=['a', 'b', 'c', 'd'])
         b = Series([2, np.nan, 1, np.nan], index=['a', 'b', 'd', 'e'])