diff options
Diffstat (limited to 'tests/twisted/idletest.py')
| -rw-r--r-- | tests/twisted/idletest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/twisted/idletest.py b/tests/twisted/idletest.py index d60e774..6d9d1e1 100644 --- a/tests/twisted/idletest.py +++ b/tests/twisted/idletest.py @@ -147,9 +147,9 @@ class BaseIRCServer(irc.IRC): f = getattr(self, 'handle%s' % command) try: f(params, prefix) - except Exception, e: + except Exception as e: self.log('handler failed: %s' % e) - except Exception, e: + except Exception as e: self.log('No handler for command %s: %s' % (command, e)) class SSLIRCServer(BaseIRCServer): @@ -244,7 +244,7 @@ def exec_test_deferred (funs, params, protocol=None, timeout=None): queue.append( Event('dbus-signal', path=unwrap(kw['path']), - signal=kw['member'], args=map(unwrap, args), + signal=kw['member'], args=list(map(unwrap, args)), interface=kw['interface'])), None, # signal name None, # interface @@ -261,7 +261,7 @@ def exec_test_deferred (funs, params, protocol=None, timeout=None): for f in funs: conn = make_connection(bus, queue.append, params) f(queue, bus, conn, server) - except Exception, e: + except Exception as e: import traceback traceback.print_exc() error = e @@ -288,7 +288,7 @@ def exec_test_deferred (funs, params, protocol=None, timeout=None): # exited and refdbg can generate its report time.sleep(5.5) - except dbus.DBusException, e: + except dbus.DBusException as e: pass def exec_tests(funs, params=None, protocol=None, timeout=None): |