various pep8 fixes

1 files changed, 85 insertions, 85 deletions

diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py
index dd52a3d..23e1777 100644
--- a/common/Util/Instruments.py
+++ b/common/Util/Instruments.py
@@ -19,22 +19,22 @@ INST_PERC = Config.INST_PERC
 instrumentDB = InstrumentDB.getRef()
 
 
-def _addInstrument( name, csoundInstrumentId, instrumentRegister, category, loopStart, loopEnd, crossDur, ampScale = 1, kit = None, kitStage = False, volatile = False, nameTooltip = "" ):
-    instrumentDB.addInstrumentFromArgs( name, csoundInstrumentId, instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, name, Config.IMAGE_ROOT+"/"+name+".png", category, kitStage = kitStage, volatile = volatile, nameTooltip = nameTooltip )
+def _addInstrument(name, csoundInstrumentId, instrumentRegister, category, loopStart, loopEnd, crossDur, ampScale=1, kit=None, kitStage=False, volatile=False, nameTooltip=""):
+    instrumentDB.addInstrumentFromArgs(name, csoundInstrumentId, instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, name, Config.IMAGE_ROOT + "/" + name + ".png", category, kitStage=kitStage, volatile=volatile, nameTooltip=nameTooltip)
 
 if Config.FEATURES_MIC:
-    _addInstrument( "mic1", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
-    _addInstrument( "mic2", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
-    _addInstrument( "mic3", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
-    _addInstrument( "mic4", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
+    _addInstrument("mic1", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile=True)
+    _addInstrument("mic2", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile=True)
+    _addInstrument("mic3", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile=True)
+    _addInstrument("mic4", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile=True)
 
 if Config.FEATURES_LAB:
-    _addInstrument( "lab1", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
-    _addInstrument( "lab2", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
-    _addInstrument( "lab3", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
-    _addInstrument( "lab4", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
-    _addInstrument( "lab5", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
-    _addInstrument( "lab6", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
+    _addInstrument("lab1", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile=True)
+    _addInstrument("lab2", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile=True)
+    _addInstrument("lab3", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile=True)
+    _addInstrument("lab4", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile=True)
+    _addInstrument("lab5", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile=True)
+    _addInstrument("lab6", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile=True)
 
 # TRANS: The sound made by this animal
 # TRANS: http://en.wikipedia.org/wiki/Guinea_pig
@@ -90,18 +90,18 @@ _addInstrument('clarinette', INST_TIED, MID, 'winds',
 _addInstrument('flute', INST_TIED, MID, 'winds',
         .47169, .53693, .02481, 1.3,
         nameTooltip=_('Flute'))
-_addInstrument( "drum1hatpedal", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True)
-_addInstrument( "drum1hatshoulder", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1hardride", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1ridebell", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1snare", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1snaresidestick", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1crash", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1splash", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1tom", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1floortom", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True)
-_addInstrument( "drum1chine", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum1kick", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
+_addInstrument("drum1hatpedal", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1hatshoulder", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1hardride", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1ridebell", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1snare", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1snaresidestick", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1crash", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1splash", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1tom", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1floortom", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1chine", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum1kick", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
 # TRANS: The sound made by this instrument
 # TRANS: http://en.wikipedia.org/wiki/Piano
 _addInstrument('piano', INST_TIED, MID, 'keyboard',
@@ -126,32 +126,32 @@ _addInstrument('duck', INST_SIMP, MID, 'animals',
 # TRANS: http://en.wikipedia.org/wiki/Blowing_a_raspberry
 _addInstrument('armbone', INST_SIMP, MID, 'people',
         0, 0, 0, 0.8,
-        nameTooltip = _('Raspberry'))
-_addInstrument( "drum2darbukadoom", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True )
-_addInstrument( "drum2darbukapied", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2darbukapiedsoft", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2hatflanger", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2darbukatak", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2darbukafinger", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2darbukaroll", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2darbukaslap", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2hatpied", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2tambourinepied", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2hatpied2", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum2tambourinepiedsoft", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3cowbell", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3cowbelltip", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True)
-_addInstrument( "drum3cup", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3djembelow", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3djembemid", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3djembesidestick", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3djembeslap", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3djembestickmid", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3metalstand", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3pedalperc", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3rainstick", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3tambourinehigh", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
+         nameTooltip=_('Raspberry'))
+_addInstrument("drum2darbukadoom", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2darbukapied", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2darbukapiedsoft", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2hatflanger", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2darbukatak", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2darbukafinger", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2darbukaroll", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2darbukaslap", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2hatpied", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2tambourinepied", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2hatpied2", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum2tambourinepiedsoft", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3cowbell", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3cowbelltip", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3cup", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3djembelow", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3djembemid", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3djembesidestick", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3djembeslap", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3djembestickmid", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3metalstand", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3pedalperc", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3rainstick", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3tambourinehigh", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum3tambourinelow", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
 # TRANS: The sound made by this instrument
 # TRANS: http://en.wikipedia.org/wiki/Harmonica
 _addInstrument('harmonica', INST_TIED, MID, 'winds',
@@ -373,41 +373,41 @@ _addInstrument('tuba', INST_TIED, LOW, 'winds',
 _addInstrument('violin', INST_TIED, MID, 'strings',
         .105, .30656, .028, 1,
         nameTooltip=_('Violin'))
-_addInstrument( "guidice1", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice2", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice3", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice4", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice5", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice6", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice7", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice8", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice9", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "guidice10", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4afrofeet", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True )
-_addInstrument( "drum4fingersn", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4mutecuic", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4stompbass", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tambouri", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr707clap", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr707open", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr808closed", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr808sn", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr909bass", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr909kick", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum4tr909sn", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5timablesslap", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5congagraveouvert", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5timablesaiguslap", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5congagraveferme", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5guiroretour", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5vibraslap", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5congaaiguouvert", INST_SIMP, MID, 'percussions', 0, 0 ,0, 1, kitStage = True )
-_addInstrument( "drum5quicamedium", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5quicaaigu", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5agogograve", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5bongoaiguouvert", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
-_addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage = True )
+_addInstrument("guidice1", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice2", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice3", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice4", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice5", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice6", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice7", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice8", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice9", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("guidice10", INST_SIMP, MID, 'concret', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4afrofeet", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4fingersn", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4mutecuic", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4stompbass", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tambouri", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr707clap", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr707open", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr808closed", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr808sn", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr909bass", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr909kick", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum4tr909sn", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5timablesslap", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5congagraveouvert", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5timablesaiguslap", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5congagraveferme", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5guiroretour", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5vibraslap", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5congaaiguouvert", INST_SIMP, MID, 'percussions', 0, 0 ,0, 1, kitStage=True)
+_addInstrument("drum5quicamedium", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5quicaaigu", INST_SIMP, MID, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5agogograve", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5bongoaiguouvert", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5agogoaigu", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
+_addInstrument("drum5bongograveouvert", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1, kitStage=True)
 # TRANS: The sound of a camera shutter
 # TRANS: http://en.wikipedia.org/wiki/Camera
 _addInstrument('camera', INST_SIMP, MID, 'concret',