Changeset 016813e for python/lib

Timestamp:

May 10, 2016, 9:18:38 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

143682b

Parents:

ddfa6be

Message:

python/lib/aubio/midiconv.py: fix instance checks

File:

• python/lib/aubio/midiconv.py (modified) (3 diffs)

python/lib/aubio/midiconv.py

@@ -5 +5 @@
 py3 = sys.version_info[0] == 3
 if py3:
-    str_instances = [str]
-    int_instances = [int]
+    str_instances = str
+    int_instances = int
 else:
-    str_instances = [str, unicode]
-    int_instances = [int, long]
+    str_instances = (str, unicode)
+    int_instances = (int, long)
 
 def note2midi(note):
@@ -17 +17 @@
                         'b': -1, u'♭': -1, u'\ufffd': -2}
     _valid_octaves = range(-1, 10)
-    if isinstance(note, str_instances):
+    if not isinstance(note, str_instances):
         raise TypeError("a string is required, got %s (%s)" % (note, str(type(note))))
     if len(note) not in range(2, 5):
@@ -52 +52 @@
 def midi2note(midi):
     " convert midi note number to note name, e.g. [0, 127] -> [C-1, G9] "
-    if isinstance(midi, int_instances):
+    if not isinstance(midi, int_instances):
         raise TypeError("an integer is required, got %s" % midi)
     if midi not in range(0, 128):