diff options
| author | Jaime <jaime.frio@gmail.com> | 2015-03-02 12:32:24 -0800 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2015-03-02 12:32:24 -0800 |
| commit | 03506a9e72d85d596021e11e9b39c5a0fd1f2eba (patch) | |
| tree | d5fd6bbe2d034e12a18c06f4299887166ed6ff81 /numpy/testing | |
| parent | 83b680b84a83c3e4b56e79396c395e30af650ba8 (diff) | |
| parent | 6ca778d275ade854cfc81a6a975230c4ccd9402c (diff) | |
| download | numpy-03506a9e72d85d596021e11e9b39c5a0fd1f2eba.tar.gz | |
Merge pull request #5622 from rmcgibbo/maint-docstrings
MAINT: Reconcile docstrings and function signatures where they disagree
Diffstat (limited to 'numpy/testing')
| -rw-r--r-- | numpy/testing/nosetester.py | 4 | ||||
| -rw-r--r-- | numpy/testing/utils.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py index b802f4472..fb1f507f0 100644 --- a/numpy/testing/nosetester.py +++ b/numpy/testing/nosetester.py @@ -84,10 +84,10 @@ def run_module_suite(file_to_run=None, argv=None): Parameters ---------- - file_to_run: str, optional + file_to_run : str, optional Path to test module, or None. By default, run the module from which this function is called. - argv: list of strings + argv : list of strings Arguments to be passed to the nose test runner. ``argv[0]`` is ignored. All command line arguments accepted by ``nosetests`` will work. If it is the default value None, sys.argv is used. diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 1051288c2..0971ebe94 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -1413,6 +1413,8 @@ def nulp_diff(x, y, dtype=None): first input array y : array_like second input array + dtype : dtype, optional + Data-type to convert `x` and `y` to if given. Default is None. Returns ------- |