diff options
author | Homu <homu@barosl.com> | 2016-01-28 14:27:58 +0900 |
---|---|---|
committer | Homu <homu@barosl.com> | 2016-01-28 14:27:58 +0900 |
commit | e2805398f9a63b825f4a2aab22e9f169ff65aae9 (patch) | |
tree | a1ebf45fcdc82a939bedc61bde2e6a2836fae453 /numpy/core | |
parent | 2b34f4bf652189e0415d5bf48ef7aa3294302871 (diff) | |
parent | 73a2fd11a74eedb97201fc8d54ea193e810ea9d3 (diff) | |
download | numpy-auto.tar.gz |
Auto merge of #7134 - dongjoon-hyun:fix_typos_in_code_comments, r=njsmithauto
MAINT: Fix some typos in a code string and comments
Diffstat (limited to 'numpy/core')
-rw-r--r-- | numpy/core/include/numpy/ndarraytypes.h | 2 | ||||
-rw-r--r-- | numpy/core/info.py | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/arrayobject.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/ctors.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/datetime_busdaycal.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/datetime_busdaycal.h | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/dtype_transfer.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/einsum.c.src | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/item_selection.c | 4 | ||||
-rw-r--r-- | numpy/core/src/multiarray/lowlevel_strided_loops.c.src | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/nditer_api.c | 4 | ||||
-rw-r--r-- | numpy/core/src/multiarray/nditer_constr.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/nditer_pywrap.c | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/nditer_templ.c.src | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/usertypes.c | 2 | ||||
-rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 2 | ||||
-rw-r--r-- | numpy/core/tests/test_einsum.py | 2 |
18 files changed, 20 insertions, 20 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h index f1fe89f1a..34f7b4e21 100644 --- a/numpy/core/include/numpy/ndarraytypes.h +++ b/numpy/core/include/numpy/ndarraytypes.h @@ -781,7 +781,7 @@ typedef int (PyArray_FinalizeFunc)(PyArrayObject *, PyObject *); /* * An array never has the next four set; they're only used as parameter - * flags to the the various FromAny functions + * flags to the various FromAny functions * * This flag may be requested in constructor functions. */ diff --git a/numpy/core/info.py b/numpy/core/info.py index 241f209b5..c6f7bbcf2 100644 --- a/numpy/core/info.py +++ b/numpy/core/info.py @@ -4,7 +4,7 @@ Functions - array - NumPy Array construction - zeros - Return an array of all zeros -- empty - Return an unitialized array +- empty - Return an uninitialized array - shape - Return shape of sequence or array - rank - Return number of dimensions - size - Return number of elements in entire array or a diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c index fd5b15a0a..eb952836c 100644 --- a/numpy/core/src/multiarray/arrayobject.c +++ b/numpy/core/src/multiarray/arrayobject.c @@ -11,7 +11,7 @@ by Travis Oliphant, oliphant@ee.byu.edu - Brigham Young Univeristy + Brigham Young University maintainer email: oliphant.travis@ieee.org diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index 2b8c35234..785b3073a 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -1049,7 +1049,7 @@ PyArray_NewFromDescr_int(PyTypeObject *subtype, PyArray_Descr *descr, int nd, sd = descr->elsize; } /* - * It is bad to have unitialized OBJECT pointers + * It is bad to have uninitialized OBJECT pointers * which could also be sub-fields of a VOID array */ if (zeroed || PyDataType_FLAGCHK(descr, NPY_NEEDS_INIT)) { diff --git a/numpy/core/src/multiarray/datetime_busdaycal.c b/numpy/core/src/multiarray/datetime_busdaycal.c index 91ba24c97..b0c53b362 100644 --- a/numpy/core/src/multiarray/datetime_busdaycal.c +++ b/numpy/core/src/multiarray/datetime_busdaycal.c @@ -214,7 +214,7 @@ qsort_datetime_compare(const void *elem1, const void *elem2) } /* - * Sorts the the array of dates provided in place and removes + * Sorts the array of dates provided in place and removes * NaT, duplicates and any date which is already excluded on account * of the weekmask. * diff --git a/numpy/core/src/multiarray/datetime_busdaycal.h b/numpy/core/src/multiarray/datetime_busdaycal.h index cd79d0bb5..02903e3d2 100644 --- a/numpy/core/src/multiarray/datetime_busdaycal.h +++ b/numpy/core/src/multiarray/datetime_busdaycal.h @@ -37,7 +37,7 @@ NPY_NO_EXPORT int PyArray_WeekMaskConverter(PyObject *weekmask_in, npy_bool *weekmask); /* - * Sorts the the array of dates provided in place and removes + * Sorts the array of dates provided in place and removes * NaT, duplicates and any date which is already excluded on account * of the weekmask. * diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c index bfb22ac30..fd371a1f6 100644 --- a/numpy/core/src/multiarray/dtype_transfer.c +++ b/numpy/core/src/multiarray/dtype_transfer.c @@ -4,7 +4,7 @@ * implemented here. * * Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * See LICENSE.txt for the license. diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src index bde543703..ee9ee1abd 100644 --- a/numpy/core/src/multiarray/einsum.c.src +++ b/numpy/core/src/multiarray/einsum.c.src @@ -3,7 +3,7 @@ * which provides an einstein-summation operation. * * Copyright (c) 2011 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * See LICENSE.txt for the license. */ diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c index 64fa70b6d..9789235c2 100644 --- a/numpy/core/src/multiarray/item_selection.c +++ b/numpy/core/src/multiarray/item_selection.c @@ -842,7 +842,7 @@ _new_sortlike(PyArrayObject *op, int axis, PyArray_SortFunc *sort, /* * For dtype's with objects, copyswapn Py_XINCREF's src * and Py_XDECREF's dst. This would crash if called on - * an unitialized buffer, or leak a reference to each + * an uninitialized buffer, or leak a reference to each * object if initialized. * * So, first do the copy with no refcounting... @@ -1003,7 +1003,7 @@ _new_argsortlike(PyArrayObject *op, int axis, PyArray_ArgSortFunc *argsort, /* * For dtype's with objects, copyswapn Py_XINCREF's src * and Py_XDECREF's dst. This would crash if called on - * an unitialized valbuffer, or leak a reference to + * an uninitialized valbuffer, or leak a reference to * each object item if initialized. * * So, first do the copy with no refcounting... diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src index 0fe63c13b..b8381ab68 100644 --- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src +++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src @@ -3,7 +3,7 @@ * strided data. * * Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * See LICENSE.txt for the license. */ diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 1df3d653d..bf25130bb 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -3869,7 +3869,7 @@ _PyArray_SigintHandler(int signum) { PyOS_setsig(signum, SIG_IGN); /* - * jump buffer may be unitialized as SIGINT allowing functions are usually + * jump buffer may be uninitialized as SIGINT allowing functions are usually * run in other threads than the master thread that receives the signal */ if (sigint_buf_init > 0) { diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c index c00360bfb..21bbbaad4 100644 --- a/numpy/core/src/multiarray/nditer_api.c +++ b/numpy/core/src/multiarray/nditer_api.c @@ -3,7 +3,7 @@ * This excludes functions specialized using the templating system. * * Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * Copyright (c) 2011 Enthought, Inc * @@ -1847,7 +1847,7 @@ npyiter_goto_iterindex(NpyIter *iter, npy_intp iterindex) } /* - * This gets called after the the buffers have been exhausted, and + * This gets called after the buffers have been exhausted, and * their data needs to be written back to the arrays. The multi-index * must be positioned for the beginning of the buffer. */ diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c index 9c5afedf6..3cbbb2b27 100644 --- a/numpy/core/src/multiarray/nditer_constr.c +++ b/numpy/core/src/multiarray/nditer_constr.c @@ -3,7 +3,7 @@ * aspects of NumPy's nditer. * * Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * Copyright (c) 2011 Enthought, Inc * diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c index 25e48ba05..67f5ab99f 100644 --- a/numpy/core/src/multiarray/nditer_pywrap.c +++ b/numpy/core/src/multiarray/nditer_pywrap.c @@ -2,7 +2,7 @@ * This file implements the CPython wrapper of the new NumPy iterator. * * Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * See LICENSE.txt for the license. */ diff --git a/numpy/core/src/multiarray/nditer_templ.c.src b/numpy/core/src/multiarray/nditer_templ.c.src index 8976b132e..0f0d59972 100644 --- a/numpy/core/src/multiarray/nditer_templ.c.src +++ b/numpy/core/src/multiarray/nditer_templ.c.src @@ -3,7 +3,7 @@ * are specialized using the templating system. * * Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com) - * The Univerity of British Columbia + * The University of British Columbia * * See LICENSE.txt for the license. */ diff --git a/numpy/core/src/multiarray/usertypes.c b/numpy/core/src/multiarray/usertypes.c index f69abcc6b..c32a710de 100644 --- a/numpy/core/src/multiarray/usertypes.c +++ b/numpy/core/src/multiarray/usertypes.c @@ -11,7 +11,7 @@ by Travis Oliphant, oliphant@ee.byu.edu - Brigham Young Univeristy + Brigham Young University maintainer email: oliphant.travis@ieee.org diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 63ed4f492..9e8c3c985 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -582,7 +582,7 @@ _is_same_name(const char* s1, const char* s2) /* * Sets core_num_dim_ix, core_num_dims, core_dim_ixs, core_offsets, * and core_signature in PyUFuncObject "ufunc". Returns 0 unless an - * error occured. + * error occurred. */ static int _parse_signature(PyUFuncObject *ufunc, const char *signature) diff --git a/numpy/core/tests/test_einsum.py b/numpy/core/tests/test_einsum.py index 1f863a7db..77fb75f10 100644 --- a/numpy/core/tests/test_einsum.py +++ b/numpy/core/tests/test_einsum.py @@ -581,7 +581,7 @@ class TestEinSum(TestCase): def test_einsum_fixed_collapsingbug(self): # Issue #5147. - # The bug only occured when output argument of einssum was used. + # The bug only occurred when output argument of einssum was used. x = np.random.normal(0, 1, (5, 5, 5, 5)) y1 = np.zeros((5, 5)) np.einsum('aabb->ab', x, out=y1) |