diff options
| -rw-r--r-- | doc/example.py | 4 | ||||
| -rw-r--r-- | numpy/core/tests/test_deprecations.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/command/config.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/example.py b/doc/example.py index 03be59d18..5c891f64c 100644 --- a/doc/example.py +++ b/doc/example.py @@ -5,7 +5,7 @@ this improves readability. Every module should have a docstring at the very top of the file. The module's docstring may extend over multiple lines. If your docstring does extend over multiple lines, the closing three quotation marks must be on -a line by itself, preferably preceeded by a blank line. +a line by itself, preferably preceded by a blank line. """ from __future__ import division, absolute_import, print_function @@ -52,7 +52,7 @@ def foo(var1, var2, long_var_name='hi') : The type above can either refer to an actual Python type (e.g. ``int``), or describe the type of the variable in more detail, e.g. ``(N,) ndarray`` or ``array_like``. - Long_variable_name : {'hi', 'ho'}, optional + long_var_name : {'hi', 'ho'}, optional Choices in brackets, default first when optional. Returns diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index f0998901d..68306de02 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -57,11 +57,11 @@ class _DeprecationTestCase(object): Parameters ---------- - f : callable + function : callable The function to test num : int Number of DeprecationWarnings 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 diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 4f20fc0de..eac53c145 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -354,7 +354,7 @@ int main (void) list of header paths libraries : seq list of libraries to link the code snippet to - libraru_dirs : seq + library_dirs : seq list of library paths decl : dict for every (key, value), the declaration in the value will be |