diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2018-04-22 14:09:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 14:09:43 -0700 |
| commit | 80de28de294b24f926133a86176f64f6a13c5411 (patch) | |
| tree | 33aaa221ac82a571243adb56a60359240bb52507 /numpy/lib/arraypad.py | |
| parent | 14e64281cfe374a9cad476599cbe9b4fa850efb7 (diff) | |
| parent | b5c1bcf1e8ef6e9c11bb4138a15286e648fcbce0 (diff) | |
| download | numpy-80de28de294b24f926133a86176f64f6a13c5411.tar.gz | |
Merge branch 'master' into npzfile-mappin
Diffstat (limited to 'numpy/lib/arraypad.py')
| -rw-r--r-- | numpy/lib/arraypad.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py index cdc354a02..daaa68d06 100644 --- a/numpy/lib/arraypad.py +++ b/numpy/lib/arraypad.py @@ -1346,9 +1346,9 @@ def pad(array, pad_width, mode, **kwargs): # Create a new padded array rank = list(range(narray.ndim)) total_dim_increase = [np.sum(pad_width[i]) for i in rank] - offset_slices = [slice(pad_width[i][0], - pad_width[i][0] + narray.shape[i]) - for i in rank] + offset_slices = tuple( + slice(pad_width[i][0], pad_width[i][0] + narray.shape[i]) + for i in rank) new_shape = np.array(narray.shape) + total_dim_increase newmat = np.zeros(new_shape, narray.dtype) |