diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-10-03 09:42:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 09:42:12 -0700 |
| commit | 1f4ed32fdf0cf2f197d9a8da5698580ed6ec7683 (patch) | |
| tree | 5296de9fe3436a8317786d15f9dc4265697ebedd | |
| parent | 2995e6a9cfb7f38f1ab8ec102cc301d3ceba480e (diff) | |
| parent | 80c624e2d986f3bb1544be46906ed1a198594f59 (diff) | |
| download | numpy-1f4ed32fdf0cf2f197d9a8da5698580ed6ec7683.tar.gz | |
Merge pull request #9815 from nafest/remove_stray_comma
BUG: fix stray comma in _array2string
| -rw-r--r-- | numpy/core/arrayprint.py | 4 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 6 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index e1df556ef..7ce6e0795 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -373,7 +373,7 @@ def _recursive_guard(fillvalue='...'): @_recursive_guard() def _array2string(a, options, separator=' ', prefix=""): if a.size > options['threshold']: - summary_insert = "..., " + summary_insert = "..." data = _leading_trailing(a) else: summary_insert = "" @@ -545,7 +545,7 @@ def _formatArray(a, format_function, rank, max_line_len, if summary_insert and 2*edge_items < len(a): leading_items = edge_items trailing_items = edge_items - summary_insert1 = summary_insert + summary_insert1 = summary_insert + separator else: leading_items = 0 trailing_items = len(a) diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index 204285a4e..e327717b1 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -5624,7 +5624,7 @@ class TestInner(object): class TestSummarization(object): def test_1d(self): A = np.arange(1001) - strA = '[ 0 1 2 ..., 998 999 1000]' + strA = '[ 0 1 2 ... 998 999 1000]' assert_(str(A) == strA) reprA = 'array([ 0, 1, 2, ..., 998, 999, 1000])' @@ -5632,8 +5632,8 @@ class TestSummarization(object): def test_2d(self): A = np.arange(1002).reshape(2, 501) - strA = '[[ 0 1 2 ..., 498 499 500]\n' \ - ' [ 501 502 503 ..., 999 1000 1001]]' + strA = '[[ 0 1 2 ... 498 499 500]\n' \ + ' [ 501 502 503 ... 999 1000 1001]]' assert_(str(A) == strA) reprA = 'array([[ 0, 1, 2, ..., 498, 499, 500],\n' \ diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index 41c56ca1e..fe0271580 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -495,8 +495,8 @@ class TestMaskedArray(object): a[1:50] = np.ma.masked assert_equal( repr(a), - 'masked_array(data = [0 -- -- ..., 1997 1998 1999],\n' - ' mask = [False True True ..., False False False],\n' + 'masked_array(data = [0 -- -- ... 1997 1998 1999],\n' + ' mask = [False True True ... False False False],\n' ' fill_value = 999999)\n' ) |