diff options
Diffstat (limited to 'urwid/main_loop.py')
| -rwxr-xr-x | urwid/main_loop.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/urwid/main_loop.py b/urwid/main_loop.py index ec9c411..442c27d 100755 --- a/urwid/main_loop.py +++ b/urwid/main_loop.py @@ -21,6 +21,7 @@ # # Urwid web site: http://excess.org/urwid/ +from __future__ import division, print_function import time import heapq @@ -694,7 +695,7 @@ class SelectEventLoop(object): """ A single iteration of the event loop """ - fds = self._watch_files.keys() + fds = list(self._watch_files.keys()) if self._alarms or self._did_something: if self._alarms: tm = self._alarms[0][0] @@ -851,7 +852,7 @@ class GLibEventLoop(object): # An exception caused us to exit, raise it now exc_info = self._exc_info self._exc_info = None - raise exc_info[0], exc_info[1], exc_info[2] + raise exc_info[0](exc_info[1]).with_traceback(exc_info[2]) def handle_exit(self,f): """ @@ -1186,7 +1187,7 @@ class TwistedEventLoop(object): # An exception caused us to exit, raise it now exc_info = self._exc_info self._exc_info = None - raise exc_info[0], exc_info[1], exc_info[2] + raise exc_info[0](exc_info[1]).with_traceback(exc_info[2]) def handle_exit(self, f, enable_idle=True): """ @@ -1206,7 +1207,7 @@ class TwistedEventLoop(object): self.reactor.stop() except: import sys - print sys.exc_info() + print(sys.exc_info()) self._exc_info = sys.exc_info() if self.manage_reactor: self.reactor.crash() @@ -1328,7 +1329,7 @@ class AsyncioEventLoop(object): self._loop.set_exception_handler(self._exception_handler) self._loop.run_forever() if self._exc_info: - raise self._exc_info[0], self._exc_info[1], self._exc_info[2] + raise self._exc_info[0](self._exc_info[1]).with_traceback(self._exc_info[2]) self._exc_info = None @@ -1357,7 +1358,7 @@ def _refl(name, rval=None, exit=False): if args and argd: args = args + ", " args = args + ", ".join([k+"="+repr(v) for k,v in argd.items()]) - print self._name+"("+args+")" + print(self._name+"("+args+")") if exit: raise ExitMainLoop() return self._rval |