diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/numeric.py | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_records.py | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_ufunc.py | 4 | ||||
| -rw-r--r-- | numpy/doc/subclassing.py | 2 | ||||
| -rwxr-xr-x | numpy/f2py/crackfortran.py | 2 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 2 | ||||
| -rw-r--r-- | numpy/testing/_private/decorators.py | 2 | ||||
| -rw-r--r-- | numpy/testing/pytest_tools/decorators.py | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index aa5059180..d154206c5 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -1,7 +1,7 @@ from __future__ import division, absolute_import, print_function try: - # Accessing collections abstact classes from collections + # Accessing collections abstract classes from collections # has been deprecated since Python 3.3 import collections.abc as collections_abc except ImportError: diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index 00e2a1e31..d861da4b6 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -1,7 +1,7 @@ from __future__ import division, absolute_import, print_function try: - # Accessing collections abstact classes from collections + # Accessing collections abstract classes from collections # has been deprecated since Python 3.3 import collections.abc as collections_abc except ImportError: diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py index 32ce5dc42..8e261d226 100644 --- a/numpy/core/tests/test_records.py +++ b/numpy/core/tests/test_records.py @@ -2,7 +2,7 @@ from __future__ import division, absolute_import, print_function import sys try: - # Accessing collections abstact classes from collections + # Accessing collections abstract classes from collections # has been deprecated since Python 3.3 import collections.abc as collections_abc except ImportError: diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py index b690c8132..576ecaf0d 100644 --- a/numpy/core/tests/test_ufunc.py +++ b/numpy/core/tests/test_ufunc.py @@ -626,7 +626,7 @@ class TestUfunc(object): assert_array_equal(c, (a * b).sum(0)) c = in1d(a, b, axes=[0, 2]) assert_array_equal(c, (a.transpose(1, 2, 0) * b).sum(-1)) - # Check errors for inproperly constructed axes arguments. + # Check errors for improperly constructed axes arguments. # should have list. assert_raises(TypeError, in1d, a, b, axes=-1) # needs enough elements @@ -671,7 +671,7 @@ class TestUfunc(object): d = mm(a, b, out=c, axes=[(-2, -1), (-2, -1), (3, 0)]) assert_(c is d) assert_array_equal(c, np.matmul(a, b).transpose(3, 0, 1, 2)) - # Check errors for inproperly constructed axes arguments. + # Check errors for improperly constructed axes arguments. # wrong argument assert_raises(TypeError, mm, a, b, axis=1) # axes should be list diff --git a/numpy/doc/subclassing.py b/numpy/doc/subclassing.py index 467e31cea..3be3d94b3 100644 --- a/numpy/doc/subclassing.py +++ b/numpy/doc/subclassing.py @@ -562,7 +562,7 @@ pass on to ``A.__array_ufunc__``, the ``super`` call in ``A`` would go to Prior to numpy 1.13, the behaviour of ufuncs could only be tuned using ``__array_wrap__`` and ``__array_prepare__``. These two allowed one to -change the output type of a ufunc, but, in constrast to +change the output type of a ufunc, but, in contrast to ``__array_ufunc__``, did not allow one to make any changes to the inputs. It is hoped to eventually deprecate these, but ``__array_wrap__`` is also used by other numpy functions and methods, such as ``squeeze``, so at the diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index dc560f98e..19ce8c145 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -612,7 +612,7 @@ multilinepattern = re.compile( def split_by_unquoted(line, characters): """ Splits the line into (line[:i], line[i:]), - where i is the index of first occurence of one of the characters + where i is the index of first occurrence of one of the characters not within quotes, or len(line) if no such index exists """ assert not (set('"\'') & set(characters)), "cannot split by unquoted quotes" diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index 9575f9c8a..d5435a1a3 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -1,7 +1,7 @@ from __future__ import division, absolute_import, print_function try: - # Accessing collections abstact classes from collections + # Accessing collections abstract classes from collections # has been deprecated since Python 3.3 import collections.abc as collections_abc except ImportError: diff --git a/numpy/testing/_private/decorators.py b/numpy/testing/_private/decorators.py index dee832404..60d3f968f 100644 --- a/numpy/testing/_private/decorators.py +++ b/numpy/testing/_private/decorators.py @@ -16,7 +16,7 @@ function name, setup and teardown functions and so on - see from __future__ import division, absolute_import, print_function try: - # Accessing collections abstact classes from collections + # Accessing collections abstract classes from collections # has been deprecated since Python 3.3 import collections.abc as collections_abc except ImportError: diff --git a/numpy/testing/pytest_tools/decorators.py b/numpy/testing/pytest_tools/decorators.py index f8addb9c8..e72b1eb0b 100644 --- a/numpy/testing/pytest_tools/decorators.py +++ b/numpy/testing/pytest_tools/decorators.py @@ -13,7 +13,7 @@ function name, setup and teardown functions and so on. from __future__ import division, absolute_import, print_function try: - # Accessing collections abstact classes from collections + # Accessing collections abstract classes from collections # has been deprecated since Python 3.3 import collections.abc as collections_abc except ImportError: |