1 files changed, 15 insertions, 9 deletions

diff --git a/gnunet/_dbus_utils.py b/gnunet/_dbus_utils.py
index 2eb317f..26cdadd 100644
--- a/gnunet/_dbus_utils.py
+++ b/gnunet/_dbus_utils.py
@@ -32,7 +32,8 @@ def pythonize(arg, argtype):
         if isinstance(arg, str):
             return strings.string_to_absolute_time(arg)
         if isinstance(arg. dbus.UInt64):
-            return datetime.datetime(1970, 1, 1) + datetime.timedelta(microseconds=arg)
+            return (datetime.datetime(1970, 1, 1)
+                    + datetime.timedelta(microseconds=arg))
         return datetime.datetime(arg)
 
 
@@ -48,7 +49,8 @@ def dbusize(arg, pretty):
 
     if isinstance(arg, datetime.datetime):
         if pretty:
-            return dbus.String(strings.absolute_time_to_string(arg), variant_level=1)
+            return dbus.String(strings.absolute_time_to_string(arg),
+                               variant_level=1)
         else:
             return dbus.UInt64((arg - datetime.datetime(1970, 1, 1)).total_seconds() * 1000000, variant_level=1)
 
@@ -60,12 +62,16 @@ def handle_exception(e, daemon, daemon_address):
         raise e
     name = name[len("org.freedesktop.DBus.Error."):]
 
-    if name == "Failed" or name == "InvalidArgs":
+    if name in ("Failed", "InvalidArgs"):
         raise GNUNetDaemonError(message)
-    if name == "NoMemory":
+    elif name == "NoMemory":
         raise MemoryError(message)
-    if name == "ServiceUnknown" or name == "NameHasNoOwner":
-        raise GNUNetDaemonError("Failed to contact " + daemon + " daemon at " + daemon_address)
-    if name == "NoReply" or name == "Timeout":
-        raise GNUNetDaemonError("Did not receive reply from " + daemon + " daemon at " + daemon_address + ". Daemon might of crashed")
-    raise e
+    elif name in ("ServiceUnknown", "NameHasNoOwner"):
+        raise GNUNetDaemonError("Failed to contact %s daemon at %s" %
+                                (daemon, daemon_address))
+    elif name in ("NoReply", "Timeout"):
+        raise GNUNetDaemonError("Did not receive reply from %s daemon at %s. "
+                                "Daemon might of crashed."
+                                % (daemon, daemon_address))
+    else:
+        raise e