X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/0adb475173e22229c0eb5c6c79b8a8488894b7c9..2feaf292e83d3c06e228ea81b4cd0a018d50de36:/src/app/eventutils.py?ds=sidebyside diff --git a/src/app/eventutils.py b/src/app/eventutils.py index f95a828..9a7dd18 100755 --- a/src/app/eventutils.py +++ b/src/app/eventutils.py @@ -29,18 +29,7 @@ $URL$ 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 event_pprinters import pprinters +from log import console, eventLogger, hiddenEvents, pprinters class _EventDispatcher : def __init__(self) : @@ -63,8 +52,7 @@ class _EventDispatcher : for event in events : listeners = self.registry.get(event.type, {}) if not hiddenEvents.has_key(event.type): - #if listeners and not hiddenEvents.has_key(event.type) : - eventLog.info(pprinters[event.type](event)) + eventLogger.info(event) for listener in listeners.keys() : listener(event)