Changeset e76842e

Timestamp:

Apr 19, 2016, 12:44:46 AM (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:

9b7f238

Parents:

376d5e9

Message:

lib/aubio/midiconv.py: prepare for python3

File:

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

python/lib/aubio/midiconv.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+
+import sys
+PY3 = sys.version_info[0] == 3
+if PY3:
+    string_types = [str]
+else:
+    string_types = [str, unicode]
 
 def note2midi(note):
@@ -6 +13 @@
     _valid_modifiers = {None: 0, u'♮': 0, '#': +1, u'♯': +1, u'\udd2a': +2, 'b': -1, u'♭': -1, u'\ufffd': -2}
     _valid_octaves = range(-1, 10)
-    if type(note) not in (str, unicode):
-        raise TypeError("a string is required, got %s" % note)
+    if type(note) not in string_types:
+        raise TypeError("a string is required, got %s (%s)" % (note, str(type(note)) ))
     if not (1 < len(note) < 5):
         raise ValueError(