Revert disambiguating underscores

Author: h-vetinari

pandas/tests/frame/test_analytics.py

@@ -91,19 +91,18 @@ def wrapper(x):
             tm.assert_series_equal(r1, expected)
 
 
-# underscores added to distinguish argument names from fixture names
-def assert_stat_op_api(opname, float_frame_, float_string_frame_,
+def assert_stat_op_api(opname, float_frame, float_string_frame,
                        has_numeric_only=False):
 
     # make sure works on mixed-type frame
-    getattr(float_string_frame_, opname)(axis=0)
-    getattr(float_string_frame_, opname)(axis=1)
+    getattr(float_string_frame, opname)(axis=0)
+    getattr(float_string_frame, opname)(axis=1)
 
     if has_numeric_only:
-        getattr(float_string_frame_, opname)(axis=0, numeric_only=True)
-        getattr(float_string_frame_, opname)(axis=1, numeric_only=True)
-        getattr(float_frame_, opname)(axis=0, numeric_only=False)
-        getattr(float_frame_, opname)(axis=1, numeric_only=False)
+        getattr(float_string_frame, opname)(axis=0, numeric_only=True)
+        getattr(float_string_frame, opname)(axis=1, numeric_only=True)
+        getattr(float_frame, opname)(axis=0, numeric_only=False)
+        getattr(float_frame, opname)(axis=1, numeric_only=False)
 
 
 def assert_bool_op_calc(opname, alternative, main_frame, has_skipna=True):
@@ -149,11 +148,10 @@ def wrapper(x):
             assert r1.all()
 
 
-# underscores added to distinguish argument names from fixture names
-def assert_bool_op_api(opname, bool_frame_with_na_, float_string_frame_,
+def assert_bool_op_api(opname, bool_frame_with_na, float_string_frame,
                        has_bool_only=False):
     # make sure op works on mixed-type frame
-    mixed = float_string_frame_
+    mixed = float_string_frame
     mixed['_bool_'] = np.random.randn(len(mixed)) > 0.5
     getattr(mixed, opname)(axis=0)
     getattr(mixed, opname)(axis=1)
@@ -168,8 +166,8 @@ def __nonzero__(self):
     if has_bool_only:
         getattr(mixed, opname)(axis=0, bool_only=True)
         getattr(mixed, opname)(axis=1, bool_only=True)
-        getattr(bool_frame_with_na_, opname)(axis=0, bool_only=False)
-        getattr(bool_frame_with_na_, opname)(axis=1, bool_only=False)
+        getattr(bool_frame_with_na, opname)(axis=0, bool_only=False)
+        getattr(bool_frame_with_na, opname)(axis=1, bool_only=False)
 
 
 class TestDataFrameAnalytics():