Merge pull request scipy#6505 from caryan/master

reset scipy.signal.resample window shape to 1-D
emmanuelle · Aug 24, 2016 · 14686dc · 14686dc
2 parents 1cd4ab9 + 9dc1379
commit 14686dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/scipy/signal/signaltools.py b/scipy/signal/signaltools.py
@@ -2211,6 +2211,7 @@ def resample(x, num, t=None, axis=0, window=None):
         newshape[axis] = len(W)
         W.shape = newshape
         X = X * W
+        W.shape = (Nx,)
     sl = [slice(None)] * x.ndim
     newshape = list(x.shape)
     newshape[axis] = num

diff --git a/scipy/signal/tests/test_signaltools.py b/scipy/signal/tests/test_signaltools.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import division, print_function, absolute_import
 
 import sys
@@ -534,6 +535,11 @@ def test_basic(self):
         assert_raises(ValueError, signal.resample_poly, sig, 'yo', 1)
         assert_raises(ValueError, signal.resample_poly, sig, 1, 0)
 
+        # test for issue #6505 - should not modify window.shape when axis ≠ 0
+        sig2 = np.tile(np.arange(160), (2,1))
+        signal.resample(sig2, num, axis=-1, window=win)
+        assert_(win.shape == (160,))
+
     def test_fft(self):
         # Test FFT-based resampling
         self._test_data(method='fft')