Disable logging earlier

diff --git a/erdslangetjie/__main__.py b/erdslangetjie/__main__.py
index e6bc2ce169f096958636cdaba8914651b0162cfd..ce2864b484b9bfddcb6786c618be851edac7ed76 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):
@@ -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()

diff --git a/erdslangetjie/constants.py b/erdslangetjie/constants.py
index f178afcd0f7a3b58ea0c77b42e5ffcca847eb483..85041cf7819e50249e7a2052c3fe17d4d762ecdf 100644 (file)
--- a/erdslangetjie/constants.py
+++ b/erdslangetjie/constants.py
@@ -1,8 +1,19 @@
-from kivy.utils import platform
-from kivy.config import Config
+import kivy
+
+kivy.require('1.6.0')
+
+from kivy.logger import Logger, LoggerHistory
 
 QUIET = False  # kivy logging - change for release
 
+if QUIET:
+   for hdlr in Logger.handlers[:]:
+       if not isinstance(hdlr, LoggerHistory):
+           Logger.removeHandler(hdlr)
+
+from kivy.utils import platform
+from kivy.config import Config
+
 if platform() != 'android':
     TILE_SIZE = 38
     Config.set('graphics', 'width', '1026')

diff --git a/erdslangetjie/editor/editor.py b/erdslangetjie/editor/editor.py
index 04c95d93593ccd063d2c4d2a569a3d6fbd24fa63..4cfe183e213391bc42e5218c86b2cdf2f7ba3902 100644 (file)
--- a/erdslangetjie/editor/editor.py
+++ b/erdslangetjie/editor/editor.py
@@ -1,18 +1,15 @@
 import sys
 import os
-import kivy
 
-kivy.require('1.6.0')
+from erdslangetjie.constants import TILE_SIZE
 
 from kivy.app import App
-from kivy.logger import Logger, LoggerHistory
 from kivy.uix.widget import Widget
 from kivy.uix.floatlayout import FloatLayout
 from kivy.graphics import Color, Rectangle
 
 from erdslangetjie.data import filepath, load
 from erdslangetjie.level import Level
-from erdslangetjie.constants import TILE_SIZE, QUIET
 
 
 class EditorWindow(FloatLayout):
@@ -70,10 +67,6 @@ def main():
         level = sys.argv[1]
     else:
         level = 'level1.txt'
-    if QUIET:
-        for hdlr in Logger.handlers[:]:
-            if not isinstance(hdlr, LoggerHistory):
-                Logger.removeHandler(hdlr)
     EditorApp(level).run()