diff options
| -rw-r--r-- | numpy/lib/arraypad.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_arraypad.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py index c80f6f54d..90b5fcfcd 100644 --- a/numpy/lib/arraypad.py +++ b/numpy/lib/arraypad.py @@ -1079,7 +1079,7 @@ def _validate_lengths(narray, number_elements): normshp = _normalize_shape(narray, number_elements) for i in normshp: chk = [1 if x is None else x for x in i] - chk = [1 if x > 0 else -1 for x in chk] + chk = [1 if x >= 0 else -1 for x in chk] if (chk[0] < 0) or (chk[1] < 0): fmt = "%s cannot contain negative values." raise ValueError(fmt % (number_elements,)) diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py index c6acd4db0..ec96f5c8c 100644 --- a/numpy/lib/tests/test_arraypad.py +++ b/numpy/lib/tests/test_arraypad.py @@ -486,6 +486,14 @@ class TestEdge(TestCase): assert_array_equal(a, b) +class TestZeroPadWidth(TestCase): + def test_zero_pad_width(self): + arr = np.arange(30) + arr = np.reshape(arr, (6, 5)) + for pad_width in (0, (0, 0), ((0, 0), (0, 0))): + assert_array_equal(arr, pad(arr, pad_width, mode='constant')) + + class ValueError1(TestCase): def test_check_simple(self): arr = np.arange(30) |