le logging commence à avoir une bonne tête.

[minwii.git] / src / app / eventutils.py

diff --git a/src/app/eventutils.py b/src/app/eventutils.py
index e45d5a3..9a7dd18 100755 (executable)
--- a/src/app/eventutils.py
+++ b/src/app/eventutils.py
@@ -29,16 +29,7 @@ $URL$
 import types
 import pygame
 from StringIO import StringIO
 import types
 import pygame
 from StringIO import StringIO

-from logging import getLogger, basicConfig, DEBUG
-import sys
-from events import TIMEOUT, COLOVER, eventNames
-basicConfig(level=DEBUG, stream = sys.stdout)
-console = getLogger('minwii')
-eventLog = getLogger('minwii.events')
-
-hiddenEvents = {pygame.MOUSEMOTION:True,
-                TIMEOUT:True,
-                COLOVER:True,}
+from log import console, eventLogger, hiddenEvents, pprinters

 
 class _EventDispatcher :
     def __init__(self) :
 
 class _EventDispatcher :
     def __init__(self) :


@@ -60,8 +51,8 @@ class _EventDispatcher :
         events = pygame.event.get()
         for event in events :
             listeners = self.registry.get(event.type, {})
         events = pygame.event.get()
         for event in events :
             listeners = self.registry.get(event.type, {})

-            if listeners and not hiddenEvents.has_key(event.type) :
-                eventLog.info((eventNames.get(event.type, event.type), event))
+            if not hiddenEvents.has_key(event.type):
+                eventLogger.info(event)

             for listener in listeners.keys() :
                 listener(event)
 
             for listener in listeners.keys() :
                 listener(event)