pep8 cleanup

[erdslangetjie.git] / erdslangetjie / __main__.py

diff --git a/erdslangetjie/__main__.py b/erdslangetjie/__main__.py
index e6bc2ce169f096958636cdaba8914651b0162cfd..aa261e447d0ae52feb4ba678befc5960aa5bbda2 100644 (file)
--- a/erdslangetjie/__main__.py
+++ b/erdslangetjie/__main__.py
@@ -1,11 +1,9 @@
-import kivy
 import pygame
 
-kivy.require('1.6.0')
+from erdslangetjie.constants import TILE_SIZE
 
 from kivy.app import App
 from kivy.uix.widget import Widget
-from kivy.logger import Logger, LoggerHistory
 from kivy.uix.relativelayout import RelativeLayout
 from kivy.uix.scrollview import ScrollView
 from kivy.uix.label import Label
@@ -15,7 +13,6 @@ from kivy.utils import platform
 from erdslangetjie.level import LevelList
 from erdslangetjie.data import load_image
 from erdslangetjie.player import ThePlayer, Nemesis
-from erdslangetjie.constants import TILE_SIZE, QUIET
 
 
 class GameWindow(RelativeLayout):
@@ -259,9 +256,9 @@ class Screen(Widget):
                 pos=((1026 - 200) / 2 - 100, 100))
         self.stop_button.bind(on_ref_press=self.app.stop_app)
         self.start_button = Label(
-                text="[ref=start][color=00ff66]" + self.START + "[/color][/ref]",
+                text="[ref=start][color=00ff66]%s[/color][/ref]" % self.START,
                 font_size=30,
-                markup = True, size=(200, 40),
+                markup=True, size=(200, 40),
                 pos=((1026 - 200) / 2 + 100, 100))
         self.start_button.bind(on_ref_press=self.app.start_game)
         self.add_widget(self.stop_button)
@@ -339,8 +336,4 @@ class GameApp(App):
 def main():
     """ Erdslangetjie, a maze game of eluding nemesis
     """
-    if QUIET:
-        for hdlr in Logger.handlers[:]:
-            if not isinstance(hdlr, LoggerHistory):
-                Logger.removeHandler(hdlr)
     GameApp().run()