Skip to content

Commit

Permalink
Merge pull request #15275 from Smit-create/fix_import_signal
Browse files Browse the repository at this point in the history
MAINT: Fix imports in `signal._signaltools`
  • Loading branch information
rgommers committed Dec 24, 2021
2 parents bdefc81 + 62ca30e commit bcd6f5f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -209,6 +209,7 @@ scipy/optimize/slsqp/_slsqpmodule.c
scipy/optimize/_lsq/givens_elimination.c
scipy/optimize/_trlib/_trlib.c
scipy/optimize/tnc/moduleTNC.c
scipy/optimize/tnc/_moduleTNC.c
scipy/signal/_peak_finding_utils.c
scipy/signal/_spectral.c
scipy/signal/_spectral.cpp
Expand Down
4 changes: 2 additions & 2 deletions scipy/signal/_fir_filter_design.py
Expand Up @@ -459,7 +459,7 @@ def firwin(numtaps, cutoff, width=None, window='hamming', pass_zero=True,
h -= left * sinc(left * m)

# Get and apply the window function.
from ._signaltools import get_window
from .windows import get_window
win = get_window(window, numtaps, fftbins=False)
h *= win

Expand Down Expand Up @@ -667,7 +667,7 @@ def firwin2(numtaps, freq, gain, nfreqs=None, window='hamming', nyq=None,

if window is not None:
# Create the window to apply to the filter coefficients.
from ._signaltools import get_window
from .windows import get_window
wind = get_window(window, numtaps, fftbins=False)
else:
wind = 1
Expand Down
3 changes: 2 additions & 1 deletion scipy/signal/_signaltools.py
Expand Up @@ -5,7 +5,8 @@
import math
import timeit
from scipy.spatial import cKDTree
from . import _sigtools, dlti
from . import _sigtools
from ._ltisys import dlti
from ._upfirdn import upfirdn, _output_len, _upfirdn_modes
from scipy import linalg, fft as sp_fft
from scipy.fft._helper import _init_nd_shape_and_axes
Expand Down

0 comments on commit bcd6f5f

Please sign in to comment.