|
3 | 3 | # See COPYING for license details. |
4 | 4 | import inspect |
5 | 5 | import numpy as np |
6 | | -import sys |
7 | 6 | from collections.abc import Iterable |
8 | 7 |
|
9 | 8 | from ._extensions._pywt import (Wavelet, ContinuousWavelet, |
10 | 9 | DiscreteContinuousWavelet, Modes) |
11 | 10 |
|
12 | 11 |
|
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 | | - |
20 | 12 | def _as_wavelet(wavelet): |
21 | 13 | """Convert wavelet name to a Wavelet object.""" |
22 | 14 | if not isinstance(wavelet, (ContinuousWavelet, Wavelet)): |
@@ -48,7 +40,7 @@ def _wavelets_per_axis(wavelet, axes): |
48 | 40 |
|
49 | 41 | """ |
50 | 42 | axes = tuple(axes) |
51 | | - if isinstance(wavelet, string_types + (Wavelet, )): |
| 43 | + if isinstance(wavelet, (str, Wavelet)): |
52 | 44 | # same wavelet on all axes |
53 | 45 | wavelets = [_as_wavelet(wavelet), ] * len(axes) |
54 | 46 | elif isinstance(wavelet, Iterable): |
@@ -84,7 +76,7 @@ def _modes_per_axis(modes, axes): |
84 | 76 |
|
85 | 77 | """ |
86 | 78 | axes = tuple(axes) |
87 | | - if isinstance(modes, string_types + (int, )): |
| 79 | + if isinstance(modes, (int, str)): |
88 | 80 | # same wavelet on all axes |
89 | 81 | modes = [Modes.from_object(modes), ] * len(axes) |
90 | 82 | elif isinstance(modes, Iterable): |
|
0 commit comments