Code cleanup

diff --git a/music_sampler.spec b/music_sampler.spec
index 5549b767f957bf77f38eb89c7dd11edb6ba8a84f..bd695623525359b3a70f908be4258147095be82c 100644 (file)
--- a/music_sampler.spec
+++ b/music_sampler.spec
@@ -6,7 +6,7 @@ from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\
 
 import importlib.machinery
 sysfont = importlib.machinery\
 
 import importlib.machinery
 sysfont = importlib.machinery\

-        .SourceFileLoader('sysfont', os.getcwd() + '/music_sampler/sysfont.py') \
+        .SourceFileLoader('sysfont', os.getcwd()+'/music_sampler/sysfont.py') \

         .load_module()
 
 excluded_and_hidden_modules = get_deps_minimal(
         .load_module()
 
 excluded_and_hidden_modules = get_deps_minimal(


@@ -40,7 +40,13 @@ a = Analysis(['run.py'],
              runtime_hooks=runtime_hooks(),
              **excluded_and_hidden_modules)
 
              runtime_hooks=runtime_hooks(),
              **excluded_and_hidden_modules)
 

-for fontname, style in [("Ubuntu", sysfont.STYLE_NORMAL), ("Ubuntu", sysfont.STYLE_BOLD), ("Symbola", sysfont.STYLE_NONE)]:
+fonts = [
+  ("Ubuntu", sysfont.STYLE_NORMAL),
+  ("Ubuntu", sysfont.STYLE_BOLD),
+  ("Symbola", sysfont.STYLE_NONE)
+]
+
+for fontname, style in fonts:

     font = sysfont.get_font(fontname, style=style)
     a.datas.append((
         'fonts/{}_{}.ttf'.format(fontname, style),
     font = sysfont.get_font(fontname, style=style)
     a.datas.append((
         'fonts/{}_{}.ttf'.format(fontname, style),

diff --git a/music_sampler/app.py b/music_sampler/app.py
index cce396972172268307e49a2a14e61665c79b9e22..08a8891d0a9f88601ffcfc1fac6689f6f92053a1 100644 (file)
--- a/music_sampler/app.py
+++ b/music_sampler/app.py
@@ -6,16 +6,17 @@ import kivy
 kivy.require("1.9.1")
 from kivy.app import App
 from kivy.uix.floatlayout import FloatLayout
 kivy.require("1.9.1")
 from kivy.app import App
 from kivy.uix.floatlayout import FloatLayout

-from kivy.uix.stacklayout import StackLayout

 from kivy.uix.relativelayout import RelativeLayout
 from kivy.properties import ListProperty, StringProperty
 from kivy.core.window import Window
 from kivy.lang import Builder
 from kivy.uix.relativelayout import RelativeLayout
 from kivy.properties import ListProperty, StringProperty
 from kivy.core.window import Window
 from kivy.lang import Builder

-from .key import Key
-from .mapping import Mapping

 
 register_fonts()
 
 
 register_fonts()
 

+
+from .key import Key
+from .mapping import Mapping
+

 from .app_blocks.actionlist import *
 from .app_blocks.playlist import *
 
 from .app_blocks.actionlist import *
 from .app_blocks.playlist import *