diff options
Diffstat (limited to 'olpcgames/eventwrap.py')
| -rw-r--r--[-rwxr-xr-x] | olpcgames/eventwrap.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/olpcgames/eventwrap.py b/olpcgames/eventwrap.py index 402109c..e87e13b 100755..100644 --- a/olpcgames/eventwrap.py +++ b/olpcgames/eventwrap.py @@ -19,15 +19,15 @@ Extensions: release a few more resources, then a bit more... """ import pygame -import gtk import Queue import thread, threading import logging +from time import time from olpcgames import util log = logging.getLogger( 'olpcgames.eventwrap' ) -from pygame.event import Event, event_name, pump as pygame_pump, get as pygame_get +from pygame.event import pump as pygame_pump, get as pygame_get class Event(object): """Mock pygame events""" @@ -67,7 +67,7 @@ class Event(object): try: self.__lock.set() log.info( '''Released GTK thread on event: %s''', self ) - except AttributeError, err: + except AttributeError: pass class CallbackResult( object ): @@ -105,7 +105,7 @@ def _releaseEvents( ): for event in _EVENTS_TO_RETIRE: try: event.retire() - except AttributeError, err: + except AttributeError: pass def _processCallbacks( events ): @@ -167,9 +167,9 @@ class _FilterQueue( Queue.Queue ): else: if timeout < 0: raise ValueError("'timeout' must be a positive number") - endtime = _time() + timeout + endtime = time() + timeout while self._empty_type( filterFunction ): - remaining = endtime - _time() + remaining = endtime - time() if remaining <= 0.0: raise Queue.Empty self.not_empty.wait(remaining) @@ -202,7 +202,7 @@ class _FilterQueue( Queue.Queue ): if filterFunction( element ): return element return None - except RuntimeError, err: + except RuntimeError: return None # none yet, at least g_events = _FilterQueue() @@ -220,7 +220,7 @@ def _typeChecker( types ): def check( element ): return element.type in types return check - except TypeError, err: + except TypeError: def check( element ): return element.type == types return check @@ -288,9 +288,9 @@ def wait( timeout = None): result = g_events.get(block=True, timeout=timeout) try: return _recordEvents( [result] )[0] - except IndexError, err: + except IndexError: return Event( type=pygame.NOEVENT ) - except Queue.Empty, err: + except Queue.Empty: return None def peek(types=None): |