fix transform to series logic

Author: yl2526

pandas/core/generic.py

@@ -52,6 +52,7 @@
 from pandas.compat.numpy import function as nv
 from pandas.compat import (map, zip, lzip, lrange, string_types,
                            isidentifier, set_function_name, cPickle as pkl)
+from pandas.core.ops import _align_method_FRAME
 import pandas.core.nanops as nanops
 from pandas.util._decorators import Appender, Substitution, deprecate_kwarg
 from pandas.util._validators import validate_bool_kwarg
@@ -4416,6 +4417,8 @@ def _clip_with_scalar(self, lower, upper, inplace=False):
     def _clip_with_one_bound(self, threshold, method, axis, inplace):
 
         inplace = validate_bool_kwarg(inplace, 'inplace')
+        if axis is not None:
+            axis = self._get_axis_number(axis)
 
         if np.any(isnull(threshold)):
             raise ValueError("Cannot use an NA value as a clip threshold")
@@ -4429,11 +4432,14 @@ def _clip_with_one_bound(self, threshold, method, axis, inplace):
         subset = method(threshold, axis=axis) | isnull(self)
 
         # GH #15390
+        # In order for where method to work, the threshold must
+        # be transformed to NDFrame from other array like structure.
         if (not isinstance(threshold, ABCSeries)) and is_list_like(threshold):
-            if isinstance(self, ABCSeries) or axis == 0:
+            if isinstance(self, ABCSeries):
                 threshold = pd.Series(threshold, index=self.index)
-            elif axis == 1:
-                threshold = pd.Series(threshold, index=self.columns)
+            else:
+                threshold = _align_method_FRAME(self, np.asarray(threshold),
+                                                axis)
         return self.where(subset, threshold, axis=axis, inplace=inplace)
 
     def clip(self, lower=None, upper=None, axis=None, inplace=False,

pandas/tests/frame/test_analytics.py

@@ -1912,12 +1912,13 @@ def test_clip_against_list_like(self, inplace, lower, axis, res):
             result = original
         tm.assert_frame_equal(result, expected, check_exact=True)
 
-    def test_clip_against_frame(self):
+    @pytest.mark.parametrize("axis", [0, 1, None])
+    def test_clip_against_frame(self, axis):
         df = DataFrame(np.random.randn(1000, 2))
         lb = DataFrame(np.random.randn(1000, 2))
         ub = lb + 1
 
-        clipped_df = df.clip(lb, ub)
+        clipped_df = df.clip(lb, ub, axis=axis)
 
         lb_mask = df <= lb
         ub_mask = df >= ub