summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/index_tricks.py2
-rw-r--r--numpy/lib/tests/test_index_tricks.py2
-rw-r--r--numpy/lib/type_check.py1
-rw-r--r--numpy/lib/user_array.py2
4 files changed, 3 insertions, 4 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index ca3d60869..b2ea5e965 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -657,7 +657,7 @@ def fill_diagonal(a, val, wrap=False):
Value to be written on the diagonal, its type must be compatible with
that of the array a.
- wrap : bool
+ wrap : bool
For tall matrices in NumPy version up to 1.6.2, the
diagonal "wrapped" after N columns. You can have this behavior
with this option. This affect only tall matrices.
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index 32b3c7036..01b705b5d 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -256,7 +256,7 @@ def test_ndindex():
assert_equal(x, [()])
x = list(np.ndindex(()))
- assert_equal(x, [()])
+ assert_equal(x, [()])
if __name__ == "__main__":
diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py
index da9e13847..d52ad095d 100644
--- a/numpy/lib/type_check.py
+++ b/numpy/lib/type_check.py
@@ -603,4 +603,3 @@ def common_type(*arrays):
return array_type[1][precision]
else:
return array_type[0][precision]
-
diff --git a/numpy/lib/user_array.py b/numpy/lib/user_array.py
index d675d3702..cc9612427 100644
--- a/numpy/lib/user_array.py
+++ b/numpy/lib/user_array.py
@@ -12,7 +12,7 @@ from numpy.core import (
bitwise_xor, invert, less, less_equal, not_equal, equal, greater,
greater_equal, shape, reshape, arange, sin, sqrt, transpose
)
-from numpy.compat import long
+from numpy.compat import long
class container(object):
def __init__(self, data, dtype=None, copy=True):