Skip to content

Commit 07c3dcf

Browse files
authored
Remove string_types, which is a remnant of Python 2 support (#654)
[ci skip]
1 parent 3961a2f commit 07c3dcf

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

pywt/_dwt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
upcoef as _upcoef, downcoef as _downcoef,
99
dwt_max_level as _dwt_max_level,
1010
dwt_coeff_len as _dwt_coeff_len)
11-
from ._utils import string_types, _as_wavelet
11+
from ._utils import _as_wavelet
1212

1313

1414
__all__ = ["dwt", "idwt", "downcoef", "upcoef", "dwt_max_level",
@@ -61,7 +61,7 @@ def dwt_max_level(data_len, filter_len):
6161
"""
6262
if isinstance(filter_len, Wavelet):
6363
filter_len = filter_len.dec_len
64-
elif isinstance(filter_len, string_types):
64+
elif isinstance(filter_len, str):
6565
if filter_len in wavelist(kind='discrete'):
6666
filter_len = Wavelet(filter_len).dec_len
6767
else:

pywt/_utils.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@
33
# See COPYING for license details.
44
import inspect
55
import numpy as np
6-
import sys
76
from collections.abc import Iterable
87

98
from ._extensions._pywt import (Wavelet, ContinuousWavelet,
109
DiscreteContinuousWavelet, Modes)
1110

1211

13-
# define string_types as in six for Python 2/3 compatibility
14-
if sys.version_info[0] == 3:
15-
string_types = str,
16-
else:
17-
string_types = basestring,
18-
19-
2012
def _as_wavelet(wavelet):
2113
"""Convert wavelet name to a Wavelet object."""
2214
if not isinstance(wavelet, (ContinuousWavelet, Wavelet)):
@@ -48,7 +40,7 @@ def _wavelets_per_axis(wavelet, axes):
4840
4941
"""
5042
axes = tuple(axes)
51-
if isinstance(wavelet, string_types + (Wavelet, )):
43+
if isinstance(wavelet, (str, Wavelet)):
5244
# same wavelet on all axes
5345
wavelets = [_as_wavelet(wavelet), ] * len(axes)
5446
elif isinstance(wavelet, Iterable):
@@ -84,7 +76,7 @@ def _modes_per_axis(modes, axes):
8476
8577
"""
8678
axes = tuple(axes)
87-
if isinstance(modes, string_types + (int, )):
79+
if isinstance(modes, (int, str)):
8880
# same wavelet on all axes
8981
modes = [Modes.from_object(modes), ] * len(axes)
9082
elif isinstance(modes, Iterable):

0 commit comments

Comments
 (0)