Add an 'axis' parameter to Series flexible comparisons. Use it to simplify clip_lower and clip_upper

Author: evanpw

pandas/core/generic.py

@@ -2853,11 +2853,8 @@ def clip_upper(self, threshold, axis=None):
         if np.any(isnull(threshold)):
             raise ValueError("Cannot use an NA value as a clip threshold")
 
-        if axis is None:
-            return self.where(self.le(threshold) | isnull(self), threshold)
-        else:
-            subset = self.le(threshold, axis=axis) | isnull(self)
-            return self.where(subset, threshold, axis=axis)
+        subset = self.le(threshold, axis=axis) | isnull(self)
+        return self.where(subset, threshold, axis=axis)
 
 
     def clip_lower(self, threshold, axis=None):
@@ -2881,11 +2878,8 @@ def clip_lower(self, threshold, axis=None):
         if np.any(isnull(threshold)):
             raise ValueError("Cannot use an NA value as a clip threshold")
 
-        if axis is None:
-            return self.where(self.ge(threshold) | isnull(self), threshold)
-        else:
-            subset = self.ge(threshold, axis=axis) | isnull(self)
-            return self.where(subset, threshold, axis=axis)
+        subset = self.ge(threshold, axis=axis) | isnull(self)
+        return self.where(subset, threshold, axis=axis)
 
 
     def groupby(self, by=None, axis=0, level=None, as_index=True, sort=True,

pandas/core/ops.py

@@ -571,7 +571,11 @@ def na_op(x, y):
 
         return result
 
-    def wrapper(self, other):
+    def wrapper(self, other, axis=None):
+        # Validate the axis parameter
+        if axis is not None:
+            self._get_axis_number(axis)
+
         if isinstance(other, pd.Series):
             name = _maybe_match_name(self, other)
             if len(self) != len(other):