ménage (par le vide)

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

diff --git a/src/app/eventutils.py b/src/app/eventutils.py
index 1172794..11e0d5c 100755 (executable)
--- a/src/app/eventutils.py
+++ b/src/app/eventutils.py
@@ -29,10 +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
-basicConfig(level=DEBUG, stream = sys.stdout)
-console = getLogger('minwii.eventutils')
+from log import console, eventLogger

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


@@ -48,11 +45,12 @@ class _EventDispatcher :
         try :
             del self.registry[eventType][listener]
         except KeyError :
         try :
             del self.registry[eventType][listener]
         except KeyError :

-            console.warn("no listener to remove")
+            console.debug("no listener to remove")

     
     def dispatchEvents(self) :
         events = pygame.event.get()
         for event in events :
     
     def dispatchEvents(self) :
         events = pygame.event.get()
         for event in events :

+            eventLogger.info(event)

             listeners = self.registry.get(event.type, {})
             for listener in listeners.keys() :
                 listener(event)
             listeners = self.registry.get(event.type, {})
             for listener in listeners.keys() :
                 listener(event)


@@ -105,8 +103,3 @@ class EventInitializer(type):
 
 class EventHandlerMixin(object) :
     __metaclass__ = EventInitializer
 
 class EventHandlerMixin(object) :
     __metaclass__ = EventInitializer

-    
-    #def input(self) :
-    #    event = pygame.event.wait()
-    #    handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
-    #    handler(event)