diff options
| author | Unknown <kunda@scribus.net> | 2017-12-12 19:08:43 -0500 |
|---|---|---|
| committer | Unknown <kunda@scribus.net> | 2017-12-12 19:09:07 -0500 |
| commit | de100beb4b53833f817d4ba9c6d940e4cff96d43 (patch) | |
| tree | eba76bff8ae029b4fb805bd6cd4bff4337922f1d /numpy/core | |
| parent | 356b481bcf8783a4ecca6aaa7d7712e347c16101 (diff) | |
| download | numpy-de100beb4b53833f817d4ba9c6d940e4cff96d43.tar.gz | |
DOC: fix minor typos
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/einsumfunc.py | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/datetime.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/flagsobject.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/mapping.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/numpyos.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/reduction.h | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 2 |
8 files changed, 9 insertions, 9 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) |
