fix conflict from clip inplace

Author: yl2526

pandas/core/generic.py

@@ -4413,6 +4413,39 @@ def _clip_with_scalar(self, lower, upper, inplace=False):
         else:
             return result
 
+    def _clip_with_one_bound(self, threshold, method, axis, inplace):
+
+        if np.any(isnull(threshold)):
+            raise ValueError("Cannot use an NA value as a clip threshold")
+
+        # method is self.le for upper bound and self.ge for lower bound
+        if is_scalar(threshold) and is_number(threshold):
+            if  method.__name__ == 'le':
+                return self._clip_with_scalar(None, threshold, inplace=inplace)
+            else:
+                return self._clip_with_scalar(threshold, None, inplace=inplace)
+
+        inplace = validate_bool_kwarg(inplace, 'inplace')
+
+        subset = method(threshold, axis=axis) | isnull(self)
+
+        # GH #15390
+        if is_scalar(threshold) or is_number(threshold):
+            return self.where(subset, threshold, axis=axis, inplace=inplace)
+
+        # For arry_like threshold, convet it to Series with corret index
+        # `where` only takes
+        try:
+            if isinstance(subset, ABCSeries):
+                threshold = pd.Series(threshold, index=subset.index)
+            elif axis == 0:
+                threshold = pd.Series(threshold, index=subset.index)
+            else:
+                threshold = pd.Series(threshold, index=subset.columns)
+        finally:
+            return self.where(subset, threshold, axis=axis, inplace=inplace)
+
+
     def clip(self, lower=None, upper=None, axis=None, inplace=False,
              *args, **kwargs):
         """
@@ -4515,16 +4548,8 @@ def clip_upper(self, threshold, axis=None, inplace=False):
         -------
         clipped : same type as input
         """
-        if np.any(isnull(threshold)):
-            raise ValueError("Cannot use an NA value as a clip threshold")
-
-        if is_scalar(threshold) and is_number(threshold):
-            return self._clip_with_scalar(None, threshold, inplace=inplace)
-
-        inplace = validate_bool_kwarg(inplace, 'inplace')
-
-        subset = self.le(threshold, axis=axis) | isnull(self)
-        return self.where(subset, threshold, axis=axis, inplace=inplace)
+        return self._clip_with_one_bound(threshold, method=self.le,
+                                        axis=axis, inplace=inplace)
 
     def clip_lower(self, threshold, axis=None, inplace=False):
         """
@@ -4547,16 +4572,8 @@ def clip_lower(self, threshold, axis=None, inplace=False):
         -------
         clipped : same type as input
         """
-        if np.any(isnull(threshold)):
-            raise ValueError("Cannot use an NA value as a clip threshold")
-
-        if is_scalar(threshold) and is_number(threshold):
-            return self._clip_with_scalar(threshold, None, inplace=inplace)
-
-        inplace = validate_bool_kwarg(inplace, 'inplace')
-
-        subset = self.ge(threshold, axis=axis) | isnull(self)
-        return self.where(subset, threshold, axis=axis, inplace=inplace)
+        return self._clip_with_one_bound(threshold, method=self.ge,
+                                        axis=axis, inplace=inplace)
 
     def groupby(self, by=None, axis=0, level=None, as_index=True, sort=True,
                 group_keys=True, squeeze=False, **kwargs):

pandas/tests/frame/test_analytics.py

@@ -1892,6 +1892,25 @@ def test_clip_against_series(self, inplace):
 
             tm.assert_series_equal(clipped_df.loc[mask, i], df.loc[mask, i])
 
+    @pytest.mark.parametrize("inplace", [True, False])
+    def test_clip_against_list(self, inplace):
+        # GH #15390
+        original = self.simple
+
+        result = original.clip(lower=[2, 3, 4], upper=[5, 6, 7],
+                               axis=1, inplace=inplace)
+
+        arr = np.array([[2., 3., 4.],
+                        [4., 5., 6.],
+                        [5., 6., 7.]])
+        expected = pd.DataFrame(arr,
+                                columns=original.columns,
+                                index=original.index)
+        if inplace:
+            tm.assert_frame_equal(original, expected, check_exact=True)
+        else:
+            tm.assert_frame_equal(result, expected, check_exact=True)
+
     def test_clip_against_frame(self):
         df = DataFrame(np.random.randn(1000, 2))
         lb = DataFrame(np.random.randn(1000, 2))

pandas/tests/series/test_analytics.py

@@ -1015,6 +1015,18 @@ def test_clip_against_series(self):
         assert_series_equal(s.clip(lower, upper), Series([1.0, 2.0, 3.5]))
         assert_series_equal(s.clip(1.5, upper), Series([1.5, 1.5, 3.5]))
 
+    @pytest.mark.parametrize("inplace", [True, False])
+    def test_clip_against_list(self, inplace):
+        # GH #15390
+        original = pd.Series([5, 6, 7])
+        result = original.clip(upper=[1, 2, 3], inplace=inplace)
+        expected = pd.Series([1, 2, 3])
+        
+        if inplace:
+            tm.assert_series_equal(original, expected, check_exact=True)
+        else:
+            tm.assert_series_equal(result, expected, check_exact=True)
+
     def test_clip_with_datetimes(self):
 
         # GH 11838