summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/_pytesttester.py2
-rw-r--r--numpy/compat/py3k.py2
-rw-r--r--numpy/core/defchararray.py4
-rw-r--r--numpy/core/src/multiarray/arraytypes.c.src2
-rw-r--r--numpy/core/src/multiarray/buffer.c2
-rw-r--r--numpy/core/src/multiarray/iterators.c2
-rw-r--r--numpy/core/tests/test_dtype.py2
-rw-r--r--numpy/doc/dispatch.py2
-rw-r--r--numpy/f2py/capi_maps.py2
-rw-r--r--numpy/linalg/lapack_lite/f2c.c4
-rw-r--r--numpy/linalg/lapack_lite/f2c_blas.c8
-rw-r--r--numpy/linalg/lapack_lite/fortran.py2
-rw-r--r--numpy/random/src/philox/philox-benchmark.c2
-rw-r--r--numpy/testing/_private/parameterized.py2
14 files changed, 19 insertions, 19 deletions
diff --git a/numpy/_pytesttester.py b/numpy/_pytesttester.py
index b25224c20..6462fc5e6 100644
--- a/numpy/_pytesttester.py
+++ b/numpy/_pytesttester.py
@@ -15,7 +15,7 @@ Warnings filtering and other runtime settings should be dealt with in the
whether or not that file is found as follows:
* ``pytest.ini`` is present (develop mode)
- All warnings except those explicily filtered out are raised as error.
+ All warnings except those explicitly filtered out are raised as error.
* ``pytest.ini`` is absent (release mode)
DeprecationWarnings and PendingDeprecationWarnings are ignored, other
warnings are passed through.
diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
index 90e17d6d6..f24a8af27 100644
--- a/numpy/compat/py3k.py
+++ b/numpy/compat/py3k.py
@@ -1,7 +1,7 @@
"""
Python 3.X compatibility tools.
-While this file was originally intented for Python 2 -> 3 transition,
+While this file was originally intended for Python 2 -> 3 transition,
it is now used to create a compatibility layer between different
minor versions of Python 3.
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py
index 2d89d6fe0..168fd8c79 100644
--- a/numpy/core/defchararray.py
+++ b/numpy/core/defchararray.py
@@ -358,7 +358,7 @@ def _mod_dispatcher(a, values):
def mod(a, values):
"""
Return (a % i), that is pre-Python 2.6 string formatting
- (iterpolation), element-wise for a pair of array_likes of str
+ (interpolation), element-wise for a pair of array_likes of str
or unicode.
Parameters
@@ -2112,7 +2112,7 @@ class chararray(ndarray):
def __mod__(self, i):
"""
Return (self % i), that is pre-Python 2.6 string formatting
- (iterpolation), element-wise for a pair of array_likes of `string_`
+ (interpolation), element-wise for a pair of array_likes of `string_`
or `unicode_`.
See also
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 9e108e3e1..99897f9c2 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -4193,7 +4193,7 @@ _datetime_dtype_metadata_clone(NpyAuxData *data)
}
/*
- * Allcoate and initialize a PyArray_DatetimeDTypeMetaData object
+ * Allocate and initialize a PyArray_DatetimeDTypeMetaData object
*/
static NpyAuxData*
_create_datetime_metadata(NPY_DATETIMEUNIT base, int num)
diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c
index 0edadee98..2939a2e39 100644
--- a/numpy/core/src/multiarray/buffer.c
+++ b/numpy/core/src/multiarray/buffer.c
@@ -523,7 +523,7 @@ _buffer_info_new(PyObject *obj)
/*
* Special case datetime64 scalars to remain backward compatible.
* This will change in a future version.
- * Note arrays of datetime64 and strutured arrays with datetime64
+ * Note arrays of datetime64 and structured arrays with datetime64
* fields will not hit this code path and are currently unsupported
* in _buffer_format_string.
*/
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index e66bb36aa..1ee0a4d60 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -172,7 +172,7 @@ NPY_NO_EXPORT PyObject *
PyArray_IterNew(PyObject *obj)
{
/*
- * Note that internall PyArray_RawIterBaseInit may be called directly on a
+ * Note that internally PyArray_RawIterBaseInit may be called directly on a
* statically allocated PyArrayIterObject.
*/
PyArrayIterObject *it;
diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py
index e18e66c64..b347a9de7 100644
--- a/numpy/core/tests/test_dtype.py
+++ b/numpy/core/tests/test_dtype.py
@@ -732,7 +732,7 @@ class TestStructuredDtypeSparseFields(object):
assert_array_equal(arr["a"]["aa"], np.zeros((3, 2, 3)))
def test_sparse_field_assignment_fancy(self):
- # Fancy assignment goes to the copyswap function for comlex types:
+ # Fancy assignment goes to the copyswap function for complex types:
arr = np.zeros(3, self.dtype)
sparse_arr = arr.view(self.sparse_dtype)
diff --git a/numpy/doc/dispatch.py b/numpy/doc/dispatch.py
index c9029941b..ba76a43ae 100644
--- a/numpy/doc/dispatch.py
+++ b/numpy/doc/dispatch.py
@@ -58,7 +58,7 @@ numpy.ndarray
How can we pass our custom array type through this function? Numpy allows a
class to indicate that it would like to handle computations in a custom-defined
-way through the interaces ``__array_ufunc__`` and ``__array_function__``. Let's
+way through the interfaces ``__array_ufunc__`` and ``__array_function__``. Let's
take one at a time, starting with ``_array_ufunc__``. This method covers
:ref:`ufuncs`, a class of functions that includes, for example,
:func:`numpy.multiply` and :func:`numpy.sin`.
diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py
index ce79f680f..917a4a9a3 100644
--- a/numpy/f2py/capi_maps.py
+++ b/numpy/f2py/capi_maps.py
@@ -79,7 +79,7 @@ c2capi_map = {'double': 'NPY_DOUBLE',
'complex_long_double': 'NPY_CDOUBLE', # forced casting
'string': 'NPY_STRING'}
-# These new maps aren't used anyhere yet, but should be by default
+# These new maps aren't used anywhere yet, but should be by default
# unless building numeric or numarray extensions.
if using_newcore:
c2capi_map = {'double': 'NPY_DOUBLE',
diff --git a/numpy/linalg/lapack_lite/f2c.c b/numpy/linalg/lapack_lite/f2c.c
index 1114bef3b..9a1e9cec1 100644
--- a/numpy/linalg/lapack_lite/f2c.c
+++ b/numpy/linalg/lapack_lite/f2c.c
@@ -567,7 +567,7 @@ if( (abi = b->i) < 0.f)
abi = - abi;
if( abr <= abi )
{
- /*Let IEEE Infinties handle this ;( */
+ /*Let IEEE Infinities handle this ;( */
/*if(abi == 0)
sig_die("complex division by zero", 1);*/
ratio = b->r / b->i ;
@@ -603,7 +603,7 @@ if( (abi = b->i) < 0.)
abi = - abi;
if( abr <= abi )
{
- /*Let IEEE Infinties handle this ;( */
+ /*Let IEEE Infinities handle this ;( */
/*if(abi == 0)
sig_die("complex division by zero", 1);*/
ratio = b->r / b->i ;
diff --git a/numpy/linalg/lapack_lite/f2c_blas.c b/numpy/linalg/lapack_lite/f2c_blas.c
index 3af506b71..44ad23bfe 100644
--- a/numpy/linalg/lapack_lite/f2c_blas.c
+++ b/numpy/linalg/lapack_lite/f2c_blas.c
@@ -4912,7 +4912,7 @@ L20:
( 1 + ( n - 1 )*abs( INCX ) ).
Before entry, the incremented array X must contain the n
element vector x. On exit, X is overwritten with the
- tranformed vector x.
+ transformed vector x.
INCX - INTEGER.
On entry, INCX specifies the increment for the elements of
@@ -9807,7 +9807,7 @@ L40:
( 1 + ( n - 1 )*abs( INCX ) ).
Before entry, the incremented array X must contain the n
element vector x. On exit, X is overwritten with the
- tranformed vector x.
+ transformed vector x.
INCX - INTEGER.
On entry, INCX specifies the increment for the elements of
@@ -14410,7 +14410,7 @@ L40:
( 1 + ( n - 1 )*abs( INCX ) ).
Before entry, the incremented array X must contain the n
element vector x. On exit, X is overwritten with the
- tranformed vector x.
+ transformed vector x.
INCX - INTEGER.
On entry, INCX specifies the increment for the elements of
@@ -19998,7 +19998,7 @@ L20:
( 1 + ( n - 1 )*abs( INCX ) ).
Before entry, the incremented array X must contain the n
element vector x. On exit, X is overwritten with the
- tranformed vector x.
+ transformed vector x.
INCX - INTEGER.
On entry, INCX specifies the increment for the elements of
diff --git a/numpy/linalg/lapack_lite/fortran.py b/numpy/linalg/lapack_lite/fortran.py
index dc0a5ebd9..671f14d24 100644
--- a/numpy/linalg/lapack_lite/fortran.py
+++ b/numpy/linalg/lapack_lite/fortran.py
@@ -14,7 +14,7 @@ def isContinuation(line):
COMMENT, STATEMENT, CONTINUATION = 0, 1, 2
def lineType(line):
- """Return the type of a line of Fortan code."""
+ """Return the type of a line of Fortran code."""
if isBlank(line):
return COMMENT
elif isLabel(line):
diff --git a/numpy/random/src/philox/philox-benchmark.c b/numpy/random/src/philox/philox-benchmark.c
index df5814d5f..9856a9b8e 100644
--- a/numpy/random/src/philox/philox-benchmark.c
+++ b/numpy/random/src/philox/philox-benchmark.c
@@ -1,5 +1,5 @@
/*
- * Simple benchamrk command
+ * Simple benchmark command
*
* cl philox-benchmark.c /Ox
*
diff --git a/numpy/testing/_private/parameterized.py b/numpy/testing/_private/parameterized.py
index 489d8e09a..2134cca88 100644
--- a/numpy/testing/_private/parameterized.py
+++ b/numpy/testing/_private/parameterized.py
@@ -271,7 +271,7 @@ def set_test_runner(name):
def detect_runner():
""" Guess which test runner we're using by traversing the stack and looking
for the first matching module. This *should* be reasonably safe, as
- it's done during test disocvery where the test runner should be the
+ it's done during test discovery where the test runner should be the
stack frame immediately outside. """
if _test_runner_override is not None:
return _test_runner_override
View Lorry Controller Status