summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@gmail.com>2016-02-21 09:28:57 +0100
committerRalf Gommers <ralf.gommers@gmail.com>2016-02-21 09:28:57 +0100
commit7d4d26a3cf540aeb55fb3e72d3a61983d7f249a9 (patch)
tree09264dd695934e6eacd082ca632e0945587421d8
parent81db4853450acc83d9316f2c034bc31be6a3f859 (diff)
parent063f298279faeb2ccb4c61d81869e1f66ca1b1f1 (diff)
downloadnumpy-7d4d26a3cf540aeb55fb3e72d3a61983d7f249a9.tar.gz
Merge pull request #7299 from dongjoon-hyun/doc_fix_mismatched_variables
DOC: Fix mismatched variable names in docstrings.
-rw-r--r--numpy/core/tests/test_deprecations.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py
index e5f57335f..8f77804af 100644
--- a/numpy/core/tests/test_deprecations.py
+++ b/numpy/core/tests/test_deprecations.py
@@ -58,12 +58,12 @@ class _VisibleDeprecationTestCase(object):
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 @@ class _VisibleDeprecationTestCase(object):
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 @@ class _DeprecationTestCase(object):
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[:] = []