summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/einsumfunc.py2
-rw-r--r--numpy/core/setup.py4
-rw-r--r--numpy/core/src/multiarray/datetime.c2
-rw-r--r--numpy/core/src/multiarray/flagsobject.c2
-rw-r--r--numpy/core/src/multiarray/mapping.c2
-rw-r--r--numpy/core/src/multiarray/numpyos.c2
-rw-r--r--numpy/core/src/umath/reduction.h2
-rw-r--r--numpy/core/tests/test_multiarray.py2
-rw-r--r--numpy/distutils/ccompiler.py2
-rw-r--r--numpy/distutils/mingw32ccompiler.py2
-rw-r--r--numpy/distutils/msvccompiler.py6
-rw-r--r--numpy/doc/byteswapping.py6
-rw-r--r--numpy/f2py/capi_maps.py2
-rw-r--r--numpy/f2py/cfuncs.py2
-rwxr-xr-xnumpy/f2py/crackfortran.py4
-rw-r--r--numpy/f2py/src/fortranobject.c6
-rw-r--r--numpy/lib/npyio.py4
-rw-r--r--numpy/testing/nose_tools/parameterized.py2
18 files changed, 27 insertions, 27 deletions
diff --git a/numpy/core/einsumfunc.py b/numpy/core/einsumfunc.py
index 1ea3e598c..3bfd984de 100644
--- a/numpy/core/einsumfunc.py
+++ b/numpy/core/einsumfunc.py
@@ -723,7 +723,7 @@ def einsum_path(*operands, **kwargs):
memory_arg = memory_limit
# Compute naive cost
- # This isnt quite right, need to look into exactly how einsum does this
+ # This isn't quite right, need to look into exactly how einsum does this
naive_cost = _compute_size_by_dict(indices, dimension_dict)
indices_in_input = input_subscripts.replace(',', '')
mult = max(len(input_list) - 1, 1)
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 371df5bec..981b0b7f0 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -30,7 +30,7 @@ NPY_RELAXED_STRIDES_DEBUG = NPY_RELAXED_STRIDES_DEBUG and NPY_RELAXED_STRIDES_CH
# XXX: ugly, we use a class to avoid calling twice some expensive functions in
# config.h/numpyconfig.h. I don't see a better way because distutils force
# config.h generation inside an Extension class, and as such sharing
-# configuration informations between extensions is not easy.
+# configuration information between extensions is not easy.
# Using a pickled-based memoize does not work because config_cmd is an instance
# method, which cPickle does not like.
#
@@ -557,7 +557,7 @@ def configuration(parent_package='',top_path=None):
if NPY_RELAXED_STRIDES_DEBUG:
moredefs.append(('NPY_RELAXED_STRIDES_DEBUG', 1))
- # Check wether we can use inttypes (C99) formats
+ # Check whether we can use inttypes (C99) formats
if config_cmd.check_decl('PRIdPTR', headers=['inttypes.h']):
moredefs.append(('NPY_USE_C99_FORMATS', 1))
diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c
index 93babe8bd..18b549cf8 100644
--- a/numpy/core/src/multiarray/datetime.c
+++ b/numpy/core/src/multiarray/datetime.c
@@ -1078,7 +1078,7 @@ get_datetime_units_factor(NPY_DATETIMEUNIT bigbase, NPY_DATETIMEUNIT littlebase)
factor *= _datetime_factors[unit];
/*
* Detect overflow by disallowing the top 16 bits to be 1.
- * That alows a margin of error much bigger than any of
+ * That allows a margin of error much bigger than any of
* the datetime factors.
*/
if (factor&0xff00000000000000ULL) {
diff --git a/numpy/core/src/multiarray/flagsobject.c b/numpy/core/src/multiarray/flagsobject.c
index af4a17def..d3dcc934f 100644
--- a/numpy/core/src/multiarray/flagsobject.c
+++ b/numpy/core/src/multiarray/flagsobject.c
@@ -88,7 +88,7 @@ PyArray_UpdateFlags(PyArrayObject *ret, int flagmask)
/*
* Check whether the given array is stored contiguously
- * in memory. And update the passed in ap flags apropriately.
+ * in memory. And update the passed in ap flags appropriately.
*
* The traditional rule is that for an array to be flagged as C contiguous,
* the following must hold:
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index 18fa7b986..e0589f1c8 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -206,7 +206,7 @@ unpack_scalar(PyObject *index, PyObject **result, npy_intp result_n)
* to. The references written are new.
* @param result_n The length of the result buffer
*
- * @returns The number of items in `result`, or -1 if an error occured.
+ * @returns The number of items in `result`, or -1 if an error occurred.
* The entries in `result` at and beyond this index should be
* assumed to contain garbage, even if they were initialized
* to NULL, so are not safe to Py_XDECREF. Use multi_DECREF to
diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c
index e6f414786..52dcbf3c8 100644
--- a/numpy/core/src/multiarray/numpyos.c
+++ b/numpy/core/src/multiarray/numpyos.c
@@ -17,7 +17,7 @@
#include <stdlib.h>
#ifdef HAVE_XLOCALE_H
/*
- * the defines from xlocale.h are included in locale.h on some sytems;
+ * the defines from xlocale.h are included in locale.h on some systems;
* see gh-8367
*/
#include <xlocale.h>
diff --git a/numpy/core/src/umath/reduction.h b/numpy/core/src/umath/reduction.h
index 7a55c5df5..f7812768c 100644
--- a/numpy/core/src/umath/reduction.h
+++ b/numpy/core/src/umath/reduction.h
@@ -25,7 +25,7 @@ typedef int (PyArray_AssignReduceIdentityFunc)(PyArrayObject *result,
* the loop, such as when the iternext() function never calls
* a function which could raise a Python exception.
*
- * Ths skip_first_count parameter indicates how many elements need to be
+ * The skip_first_count parameter indicates how many elements need to be
* skipped based on NpyIter_IsFirstVisit checks. This can only be positive
* when the 'assign_identity' parameter was NULL when calling
* PyArray_ReduceWrapper.
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index fdd34b6c0..39aab7efe 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -6955,7 +6955,7 @@ class TestArrayPriority(object):
op.ge, op.lt, op.le, op.ne, op.eq
]
- # See #7949. Dont use "/" operator With -3 switch, since python reports it
+ # See #7949. Don't use "/" operator With -3 switch, since python reports it
# as a DeprecationWarning
if sys.version_info[0] < 3 and not sys.py3kwarning:
binary_ops.append(op.div)
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py
index bbc3923bd..b03fb96b2 100644
--- a/numpy/distutils/ccompiler.py
+++ b/numpy/distutils/ccompiler.py
@@ -50,7 +50,7 @@ def _needs_build(obj, cc_args, extra_postargs, pp_opts):
return True
# dep_file is a makefile containing 'object: dependencies'
- # formated like posix shell (spaces escaped, \ line continuations)
+ # formatted like posix shell (spaces escaped, \ line continuations)
# the last line contains the compiler commandline arguments as some
# projects may compile an extension multiple times with different
# arguments
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index ce9cd6180..e7fa7bc0d 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -569,7 +569,7 @@ def msvc_manifest_xml(maj, min):
(maj, min))
# Don't be fooled, it looks like an XML, but it is not. In particular, it
# should not have any space before starting, and its size should be
- # divisible by 4, most likely for alignement constraints when the xml is
+ # divisible by 4, most likely for alignment constraints when the xml is
# embedded in the binary...
# This template was copied directly from the python 2.6 binary (using
# strings.exe from mingw on python.exe).
diff --git a/numpy/distutils/msvccompiler.py b/numpy/distutils/msvccompiler.py
index 903d75188..0cb4bf979 100644
--- a/numpy/distutils/msvccompiler.py
+++ b/numpy/distutils/msvccompiler.py
@@ -11,15 +11,15 @@ def _merge(old, new):
Here `old` is the environment string before the base class initialize
function is called and `new` is the string after the call. The new string
- will be a fixed string if it is not obtained from the current enviroment,
- or the same as the old string if obtained from the same enviroment. The aim
+ will be a fixed string if it is not obtained from the current environment,
+ or the same as the old string if obtained from the same environment. The aim
here is not to append the new string if it is already contained in the old
string so as to limit the growth of the environment string.
Parameters
----------
old : string
- Previous enviroment string.
+ Previous environment string.
new : string
New environment string.
diff --git a/numpy/doc/byteswapping.py b/numpy/doc/byteswapping.py
index d67e2cff0..f9491ed43 100644
--- a/numpy/doc/byteswapping.py
+++ b/numpy/doc/byteswapping.py
@@ -85,11 +85,11 @@ underlying memory it is looking at:
The common situations in which you need to change byte ordering are:
-#. Your data and dtype endianess don't match, and you want to change
+#. Your data and dtype endianness don't match, and you want to change
the dtype so that it matches the data.
-#. Your data and dtype endianess don't match, and you want to swap the
+#. Your data and dtype endianness don't match, and you want to swap the
data so that they match the dtype
-#. Your data and dtype endianess match, but you want the data swapped
+#. Your data and dtype endianness match, but you want the data swapped
and the dtype to reflect this
Data and dtype endianness don't match, change dtype to match data
diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py
index 64829d30c..8e63d3cff 100644
--- a/numpy/f2py/capi_maps.py
+++ b/numpy/f2py/capi_maps.py
@@ -333,7 +333,7 @@ def getarrdims(a, var, verbose=0):
ret['dims'] = ','.join(dim)
ret['rank'] = repr(len(dim))
ret['rank*[-1]'] = repr(len(dim) * [-1])[1:-1]
- for i in range(len(dim)): # solve dim for dependecies
+ for i in range(len(dim)): # solve dim for dependencies
v = []
if dim[i] in depargs:
v = [dim[i]]
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index 3b7f694d4..d59b6301c 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -542,7 +542,7 @@ cppmacros[
'ARRSIZE'] = '#define ARRSIZE(dims,rank) (_PyArray_multiply_list(dims,rank))'
cppmacros['OLDPYNUM'] = """\
#ifdef OLDPYNUM
-#error You need to intall Numeric Python version 13 or higher. Get it from http:/sourceforge.net/project/?group_id=1369
+#error You need to install Numeric Python version 13 or higher. Get it from http:/sourceforge.net/project/?group_id=1369
#endif
"""
################# C functions ###############
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py
index 677f4bae3..78802ef07 100755
--- a/numpy/f2py/crackfortran.py
+++ b/numpy/f2py/crackfortran.py
@@ -2707,7 +2707,7 @@ def analyzevars(block):
i = -1
ni = len(vars[n]['dimension'])
for d in vars[n]['dimension']:
- ddeps = [] # dependecies of 'd'
+ ddeps = [] # dependencies of 'd'
ad = ''
pd = ''
if d not in vars:
@@ -3324,7 +3324,7 @@ if __name__ == "__main__":
funcs.append(l)
if not strictf77 and f77modulename and not skipemptyends:
outmess("""\
- Warning: You have specifyied module name for non Fortran 77 code
+ Warning: You have specified module name for non Fortran 77 code
that should not need one (expect if you are scanning F90 code
for non module blocks but then you should use flag -skipemptyends
and also be sure that the files do not contain programs without program statement).
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c
index 96b08ea18..a47733433 100644
--- a/numpy/f2py/src/fortranobject.c
+++ b/numpy/f2py/src/fortranobject.c
@@ -576,7 +576,7 @@ static void f2py_report_on_array_copy_fromany(void) {
*
* Description:
* ------------
- * Provides array_from_pyobj function that returns a contigious array
+ * Provides array_from_pyobj function that returns a contiguous array
* object with the given dimensions and required storage order, either
* in row-major (C) or column-major (Fortran) order. The function
* array_from_pyobj is very flexible about its Python object argument
@@ -745,8 +745,8 @@ PyArrayObject* array_from_pyobj(const int type_num,
return NULL;
}
/*
- printf("intent alignement=%d\n", F2PY_GET_ALIGNMENT(intent));
- printf("alignement check=%d\n", F2PY_CHECK_ALIGNMENT(arr, intent));
+ printf("intent alignment=%d\n", F2PY_GET_ALIGNMENT(intent));
+ printf("alignment check=%d\n", F2PY_CHECK_ALIGNMENT(arr, intent));
int i;
for (i=1;i<=16;i++)
printf("i=%d isaligned=%d\n", i, ARRAY_ISALIGNED(arr, i));
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 7b51cb9c7..66dc68538 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -766,7 +766,7 @@ def _getconv(dtype):
else:
return asstr
-# amount of lines loadtxt reads in one chunk, can be overriden for testing
+# amount of lines loadtxt reads in one chunk, can be overridden for testing
_loadtxt_chunksize = 50000
def loadtxt(fname, dtype=float, comments='#', delimiter=None,
@@ -1542,7 +1542,7 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
names : {None, True, str, sequence}, optional
If `names` is True, the field names are read from the first line after
the first `skip_header` lines. This line can optionally be proceeded
- by a comment delimeter. If `names` is a sequence or a single-string of
+ by a comment delimiter. If `names` is a sequence or a single-string of
comma-separated names, the names will be used to define the field names
in a structured dtype. If `names` is None, the names of the dtype
fields will be used, if any.
diff --git a/numpy/testing/nose_tools/parameterized.py b/numpy/testing/nose_tools/parameterized.py
index 962fddcbf..372928e3d 100644
--- a/numpy/testing/nose_tools/parameterized.py
+++ b/numpy/testing/nose_tools/parameterized.py
@@ -409,7 +409,7 @@ class parameterized(object):
@classmethod
def check_input_values(cls, input_values):
- # Explicitly convery non-list inputs to a list so that:
+ # Explicitly convert non-list inputs to a list so that:
# 1. A helpful exception will be raised if they aren't iterable, and
# 2. Generators are unwrapped exactly once (otherwise `nosetests
# --processes=n` has issues; see:
View Lorry Controller Status