Merge pull request #7299 from dongjoon-hyun/doc_fix_mismatched_variables

rgommers · rgommers · commit 7d4d26a3cf54 · 2016-02-21T09:28:57.000+01:00
DOC: Fix mismatched variable names in docstrings.
diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py
@@ -58,12 +58,12 @@ def assert_deprecated(self, function, num=1, ignore_others=False,
 
         Parameters
         ----------
-        f : callable
+        function : callable
             The function to test
         num : int
             Number of VisibleDeprecationWarnings to expect. This should
             normally be 1.
-        ignore_other : bool
+        ignore_others : bool
             Whether warnings of the wrong type should be ignored (note that
             the message is not checked)
         function_fails : bool
@@ -74,9 +74,9 @@ def assert_deprecated(self, function, num=1, ignore_others=False,
             The default checks for DeprecationWarnings. If exceptions is
             empty the function is expected to run successfull.
         args : tuple
-            Arguments for `f`
+            Arguments for `function`
         kwargs : dict
-            Keyword arguments for `f`
+            Keyword arguments for `function`
         """
         # reset the log
         self.log[:] = []
@@ -175,9 +175,9 @@ def assert_deprecated(self, function, num=1, ignore_others=False,
             The default checks for DeprecationWarnings. If exceptions is
             empty the function is expected to run successfull.
         args : tuple
-            Arguments for `f`
+            Arguments for `function`
         kwargs : dict
-            Keyword arguments for `f`
+            Keyword arguments for `function`
         """
         # reset the log
         self.log[:] = []
