[py] [style] add space around * in midiconv.py

[aubio.git] / python / lib / aubio / midiconv.py

diff --git a/python/lib/aubio/midiconv.py b/python/lib/aubio/midiconv.py
index dcafda1..99b3c0b 100644 (file)
--- a/python/lib/aubio/midiconv.py
+++ b/python/lib/aubio/midiconv.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 """ utilities to convert midi note number to and from note names """
 
-__all__ = ['note2midi', 'midi2note', 'freq2note', 'note2freq']
-
 import sys
 from ._aubio import freqtomidi, miditofreq
 
+__all__ = ['note2midi', 'midi2note', 'freq2note', 'note2freq']
+
 py3 = sys.version_info[0] == 3
 if py3:
     str_instances = str
@@ -14,6 +14,7 @@ else:
     str_instances = (str, unicode)
     int_instances = (int, long)
 
+
 def note2midi(note):
     """Convert note name to midi note number.
 
@@ -55,13 +56,14 @@ def note2midi(note):
     --------
     midi2note, freqtomidi, miditofreq
     """
-    _valid_notenames = {'C': 0, 'D': 2, 'E': 4, 'F': 5, 'G': 7, 'A': 9, 'B': 11}
+    _valid_notenames = {'C': 0, 'D': 2, 'E': 4, 'F': 5, 'G': 7,
+                        'A': 9, 'B': 11}
     _valid_modifiers = {
-            u'𝄫': -2,                        # double flat
-            u'♭': -1, 'b': -1, '\u266d': -1, # simple flat
-            u'♮': 0, '\u266e': 0, None: 0,   # natural
-            '#': +1, u'♯': +1, '\u266f': +1, # sharp
-            u'𝄪': +2,                        # double sharp
+            u'𝄫': -2,                         # double flat
+            u'♭': -1, 'b': -1, '\u266d': -1,  # simple flat
+            u'♮': 0, '\u266e': 0, None: 0,    # natural
+            '#': +1, u'♯': +1, '\u266f': +1,  # sharp
+            u'𝄪': +2,                         # double sharp
             }
     _valid_octaves = range(-1, 10)
     if not isinstance(note, str_instances):
@@ -70,7 +72,7 @@ def note2midi(note):
     if len(note) not in range(2, 5):
         msg = "string of 2 to 4 characters expected, got {:d} ({:s})"
         raise ValueError(msg.format(len(note), note))
-    notename, modifier, octave = [None]*3
+    notename, modifier, octave = [None] * 3
 
     if len(note) == 4:
         notename, modifier, octave_sign, octave = note
@@ -93,12 +95,13 @@ def note2midi(note):
     if octave not in _valid_octaves:
         raise ValueError("%s is not a valid octave" % octave)
 
-    midi = 12 + octave * 12 + _valid_notenames[notename] \
-            + _valid_modifiers[modifier]
+    midi = (octave + 1) * 12 + _valid_notenames[notename] \
+                             + _valid_modifiers[modifier]
     if midi > 127:
         raise ValueError("%s is outside of the range C-2 to G8" % note)
     return midi
 
+
 def midi2note(midi):
     """Convert midi note number to note name.
 
@@ -136,9 +139,10 @@ def midi2note(midi):
         msg = "an integer between 0 and 127 is excepted, got {:d}"
         raise ValueError(msg.format(midi))
     _valid_notenames = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#',
-            'A', 'A#', 'B']
+                        'A', 'A#', 'B']
     return _valid_notenames[midi % 12] + str(int(midi / 12) - 1)
 
+
 def freq2note(freq):
     """Convert frequency in Hz to nearest note name.
 
@@ -162,6 +166,7 @@ def freq2note(freq):
     nearest_note = int(freqtomidi(freq) + .5)
     return midi2note(nearest_note)
 
+
 def note2freq(note):
     """Convert note name to corresponding frequency, in Hz.