Merge PR #2750

Author: wesm

RELEASE.rst

@@ -66,6 +66,8 @@ pandas 0.11.0
        correctly
      - astype on datetimes to object are now handled (as well as NaT
        conversions to np.nan)
+  - arguments to DataFrame.clip were inconsistent to numpy and Series clipping
+    (GH2747_)
 
 **Bug Fixes**
 
@@ -80,6 +82,7 @@ pandas 0.11.0
 .. _GH2778: https://github.com/pydata/pandas/issues/2778
 .. _GH2793: https://github.com/pydata/pandas/issues/2793
 .. _GH2751: https://github.com/pydata/pandas/issues/2751
+.. _GH2747: https://github.com/pydata/pandas/issues/2747
 
 pandas 0.10.1
 =============

pandas/core/frame.py

@@ -5038,7 +5038,7 @@ def f(arr):
         data = self._get_numeric_data() if numeric_only else self
         return data.apply(f, axis=axis)
 
-    def clip(self, upper=None, lower=None):
+    def clip(self, lower=None, upper=None):
         """
         Trim values at input threshold(s)
 
@@ -5051,6 +5051,11 @@ def clip(self, upper=None, lower=None):
         -------
         clipped : DataFrame
         """
+
+        # GH 2747 (arguments were reversed)
+        if lower is not None and upper is not None:
+            lower, upper = min(lower,upper), max(lower,upper)
+            
         return self.apply(lambda x: x.clip(lower=lower, upper=upper))
 
     def clip_upper(self, threshold):

pandas/tests/test_frame.py

@@ -6993,6 +6993,22 @@ def test_clip(self):
         double = self.frame.clip(upper=median, lower=median)
         self.assert_(not (double.values != median).any())
 
+    def test_dataframe_clip(self):
+
+        # GH #2747
+        df = DataFrame(np.random.randn(1000,2))
+
+        for lb, ub in [(-1,1),(1,-1)]:
+            clipped_df = df.clip(lb, ub)
+
+            lb, ub = min(lb,ub), max(ub,lb)
+            lb_mask = df.values <= lb
+            ub_mask = df.values >= ub
+            mask = ~lb_mask & ~ub_mask
+            self.assert_((clipped_df.values[lb_mask] == lb).all() == True)
+            self.assert_((clipped_df.values[ub_mask] == ub).all() == True)
+            self.assert_((clipped_df.values[mask] == df.values[mask]).all() == True)
+        
     def test_get_X_columns(self):
         # numeric and object columns