summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2020-05-17 12:35:57 +0300
committerGitHub <noreply@github.com>2020-05-17 12:35:57 +0300
commitbd8be5417632c019dbc1d36400052805f95a372c (patch)
treea10a8a468d7d7dd0d25f5b6ac53a7f7b4b37053a /numpy
parent125b0c82053c42c43d1b4b36c6184ae71c75c548 (diff)
parent0a2893149e88e5c5bb69a29f78a4ad262a08cd29 (diff)
downloadnumpy-bd8be5417632c019dbc1d36400052805f95a372c.tar.gz
Merge pull request #16269 from tbm/typo
DOC: Fix typos and cosmetic issues
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/defchararray.py2
-rw-r--r--numpy/core/setup.py2
-rw-r--r--numpy/core/src/common/mem_overlap.c2
-rw-r--r--numpy/core/src/multiarray/arraytypes.c.src2
-rw-r--r--numpy/core/src/multiarray/dragon4.c2
-rw-r--r--numpy/core/src/multiarray/mapping.c2
-rw-r--r--numpy/lib/financial.py2
7 files changed, 7 insertions, 7 deletions
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py
index cd01c0e77..1d447b86a 100644
--- a/numpy/core/defchararray.py
+++ b/numpy/core/defchararray.py
@@ -1779,7 +1779,7 @@ def isdecimal(a):
Calls `unicode.isdecimal` element-wise.
Decimal characters include digit characters, and all characters
- that that can be used to form decimal-radix numbers,
+ that can be used to form decimal-radix numbers,
e.g. ``U+0660, ARABIC-INDIC DIGIT ZERO``.
Parameters
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 76f3f5abe..fcc422545 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -520,7 +520,7 @@ def configuration(parent_package='',top_path=None):
def generate_numpyconfig_h(ext, build_dir):
"""Depends on config.h: generate_config_h has to be called before !"""
# put common include directory in build_dir on search path
- # allows using code generation in headers headers
+ # allows using code generation in headers
config.add_include_dirs(join(build_dir, "src", "common"))
config.add_include_dirs(join(build_dir, "src", "npymath"))
diff --git a/numpy/core/src/common/mem_overlap.c b/numpy/core/src/common/mem_overlap.c
index 21db1893b..9da33bfc1 100644
--- a/numpy/core/src/common/mem_overlap.c
+++ b/numpy/core/src/common/mem_overlap.c
@@ -127,7 +127,7 @@
ends up considering all values x3=0...5 separately.
The upper bound for work done is prod(shape_a)*prod(shape_b), which scales
- faster than than work done by binary ufuncs, after broadcasting,
+ faster than work done by binary ufuncs, after broadcasting,
prod(shape_a). The bound may be loose, but it is possible to construct hard
instances where ufunc is faster (adapted from [2,3])::
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 024dcab8c..38d5f21eb 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -3846,7 +3846,7 @@ static void
*/
/*
- * Compute correlation of data with with small kernels
+ * Compute correlation of data with small kernels
* Calling a BLAS dot product for the inner loop of the correlation is overkill
* for small kernels. It is faster to compute it directly.
* Intended to be used by _pyarray_correlate so no input verifications is done
diff --git a/numpy/core/src/multiarray/dragon4.c b/numpy/core/src/multiarray/dragon4.c
index 282cdad28..553d0effb 100644
--- a/numpy/core/src/multiarray/dragon4.c
+++ b/numpy/core/src/multiarray/dragon4.c
@@ -1566,7 +1566,7 @@ Dragon4(BigInt *bigints, const npy_int32 exponent,
*
* scientific - boolean controlling whether scientific notation is used
* digit_mode - whether to use unique or fixed fractional output
- * cutoff_mode - whether 'precision' refers to to all digits, or digits past
+ * cutoff_mode - whether 'precision' refers to all digits, or digits past
* the decimal point.
* precision - When negative, prints as many digits as needed for a unique
* number. When positive specifies the maximum number of
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index 7047304eb..43dbde2f1 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -2689,7 +2689,7 @@ PyArray_MapIterNew(npy_index_info *indices , int index_num, int index_type,
if (mit->numiter == 0) {
/*
* For MapIterArray, it is possible that there is no fancy index.
- * to support this case, add a a dummy iterator.
+ * to support this case, add a dummy iterator.
* Since it is 0-d its transpose, etc. does not matter.
*/
diff --git a/numpy/lib/financial.py b/numpy/lib/financial.py
index b055bb1ec..709a79dc0 100644
--- a/numpy/lib/financial.py
+++ b/numpy/lib/financial.py
@@ -466,7 +466,7 @@ def _rbl(rate, per, pmt, pv, when):
This function is here to simply have a different name for the 'fv'
function to not interfere with the 'fv' keyword argument within the 'ipmt'
function. It is the 'remaining balance on loan' which might be useful as
- it's own function, but is easily calculated with the 'fv' function.
+ its own function, but is easily calculated with the 'fv' function.
"""
return fv(rate, (per - 1), pmt, pv, when)