Modernize multiline imports in preparation for Python 3 support.

8 files changed, 57 insertions, 74 deletions

diff --git a/dbus/__init__.py b/dbus/__init__.py
index 1807a30..803ed2a 100644
--- a/dbus/__init__.py
+++ b/dbus/__init__.py
@@ -78,24 +78,20 @@ except ImportError:
 import dbus.exceptions as exceptions
 import dbus.types as types
 
-from _dbus_bindings import get_default_main_loop, set_default_main_loop,\
-                           validate_interface_name, validate_member_name,\
-                           validate_bus_name, validate_object_path,\
-                           validate_error_name
-from _dbus_bindings import BUS_DAEMON_NAME, BUS_DAEMON_PATH, BUS_DAEMON_IFACE,\
-                           LOCAL_PATH, LOCAL_IFACE, PEER_IFACE,\
-                           INTROSPECTABLE_IFACE, PROPERTIES_IFACE
-
-from dbus.exceptions import MissingErrorHandlerException, \
-                            MissingReplyHandlerException, \
-                            ValidationException, \
-                            IntrospectionParserException, \
-                            UnknownMethodException, \
-                            NameExistsException, \
-                            DBusException
-from _dbus_bindings import ObjectPath, ByteArray, Signature, Byte, Boolean,\
-                           Int16, UInt16, Int32, UInt32, Int64, UInt64,\
-                           Double, String, Array, Struct, Dictionary, \
-                           UTF8String
+from _dbus_bindings import (
+    get_default_main_loop, set_default_main_loop, validate_bus_name,
+    validate_error_name, validate_interface_name, validate_member_name,
+    validate_object_path)
+from _dbus_bindings import (
+    BUS_DAEMON_IFACE, BUS_DAEMON_NAME, BUS_DAEMON_PATH, INTROSPECTABLE_IFACE,
+    LOCAL_IFACE, LOCAL_PATH, PEER_IFACE, PROPERTIES_IFACE)
+
+from dbus.exceptions import (
+    DBusException, IntrospectionParserException, MissingErrorHandlerException,
+    MissingReplyHandlerException, NameExistsException, UnknownMethodException,
+    ValidationException)
+from _dbus_bindings import (
+    Array, Boolean, Byte, ByteArray, Dictionary, Double, Int16, Int32, Int64,
+    ObjectPath, Signature, String, Struct, UInt16, UInt32, UInt64, UTF8String)
 from dbus._dbus import Bus, SystemBus, SessionBus, StarterBus
 from dbus.proxies import Interface
diff --git a/dbus/_dbus.py b/dbus/_dbus.py
index bf0adaa..808d44b 100644
--- a/dbus/_dbus.py
+++ b/dbus/_dbus.py
@@ -36,13 +36,11 @@ import weakref
 from traceback import print_exc
 
 from dbus.exceptions import DBusException
-from _dbus_bindings import BUS_DAEMON_NAME, BUS_DAEMON_PATH,\
-                           BUS_DAEMON_IFACE, UTF8String,\
-                           validate_member_name, validate_interface_name,\
-                           validate_bus_name, validate_object_path,\
-                           BUS_SESSION, BUS_SYSTEM, BUS_STARTER,\
-                           DBUS_START_REPLY_SUCCESS, \
-                           DBUS_START_REPLY_ALREADY_RUNNING
+from _dbus_bindings import (
+    BUS_DAEMON_IFACE, BUS_DAEMON_NAME, BUS_DAEMON_PATH, BUS_SESSION,
+    BUS_STARTER, BUS_SYSTEM, DBUS_START_REPLY_ALREADY_RUNNING,
+    DBUS_START_REPLY_SUCCESS, UTF8String, validate_bus_name,
+    validate_interface_name, validate_member_name, validate_object_path)
 from dbus.bus import BusConnection
 from dbus.lowlevel import SignalMessage
 
diff --git a/dbus/bus.py b/dbus/bus.py
index 6f775de..9f77717 100644
--- a/dbus/bus.py
+++ b/dbus/bus.py
@@ -26,23 +26,16 @@ __docformat__ = 'reStructuredText'
 import logging
 import weakref
 
-from _dbus_bindings import validate_interface_name, validate_member_name,\
-                           validate_bus_name, validate_object_path,\
-                           validate_error_name,\
-                           BUS_SESSION, BUS_STARTER, BUS_SYSTEM, \
-                           DBUS_START_REPLY_SUCCESS, \
-                           DBUS_START_REPLY_ALREADY_RUNNING, \
-                           BUS_DAEMON_NAME, BUS_DAEMON_PATH, BUS_DAEMON_IFACE,\
-                           NAME_FLAG_ALLOW_REPLACEMENT, \
-                           NAME_FLAG_DO_NOT_QUEUE, \
-                           NAME_FLAG_REPLACE_EXISTING, \
-                           RELEASE_NAME_REPLY_NON_EXISTENT, \
-                           RELEASE_NAME_REPLY_NOT_OWNER, \
-                           RELEASE_NAME_REPLY_RELEASED, \
-                           REQUEST_NAME_REPLY_ALREADY_OWNER, \
-                           REQUEST_NAME_REPLY_EXISTS, \
-                           REQUEST_NAME_REPLY_IN_QUEUE, \
-                           REQUEST_NAME_REPLY_PRIMARY_OWNER
+from _dbus_bindings import (
+    BUS_DAEMON_IFACE, BUS_DAEMON_NAME, BUS_DAEMON_PATH, BUS_SESSION,
+    BUS_STARTER, BUS_SYSTEM, DBUS_START_REPLY_ALREADY_RUNNING,
+    DBUS_START_REPLY_SUCCESS, NAME_FLAG_ALLOW_REPLACEMENT,
+    NAME_FLAG_DO_NOT_QUEUE, NAME_FLAG_REPLACE_EXISTING,
+    RELEASE_NAME_REPLY_NON_EXISTENT, RELEASE_NAME_REPLY_NOT_OWNER,
+    RELEASE_NAME_REPLY_RELEASED, REQUEST_NAME_REPLY_ALREADY_OWNER,
+    REQUEST_NAME_REPLY_EXISTS, REQUEST_NAME_REPLY_IN_QUEUE,
+    REQUEST_NAME_REPLY_PRIMARY_OWNER, validate_bus_name, validate_error_name,
+    validate_interface_name, validate_member_name, validate_object_path)
 from dbus.connection import Connection
 from dbus.exceptions import DBusException
 from dbus.lowlevel import HANDLER_RESULT_NOT_YET_HANDLED
diff --git a/dbus/connection.py b/dbus/connection.py
index 89e9a2c..1215519 100644
--- a/dbus/connection.py
+++ b/dbus/connection.py
@@ -27,15 +27,14 @@ import logging
 import threading
 import weakref
 
-from _dbus_bindings import Connection as _Connection, \
-                           LOCAL_PATH, LOCAL_IFACE, \
-                           validate_interface_name, validate_member_name,\
-                           validate_bus_name, validate_object_path,\
-                           validate_error_name, \
-                           UTF8String
+from _dbus_bindings import (
+    Connection as _Connection, LOCAL_IFACE, LOCAL_PATH, UTF8String,
+    validate_bus_name, validate_error_name, validate_interface_name,
+    validate_member_name, validate_object_path)
 from dbus.exceptions import DBusException
-from dbus.lowlevel import ErrorMessage, MethodCallMessage, SignalMessage, \
-                          MethodReturnMessage, HANDLER_RESULT_NOT_YET_HANDLED
+from dbus.lowlevel import (
+    ErrorMessage, HANDLER_RESULT_NOT_YET_HANDLED, MethodCallMessage,
+    MethodReturnMessage, SignalMessage)
 from dbus.proxies import ProxyObject
 
 
diff --git a/dbus/lowlevel.py b/dbus/lowlevel.py
index 2754344..398a10f 100644
--- a/dbus/lowlevel.py
+++ b/dbus/lowlevel.py
@@ -29,12 +29,8 @@ __all__ = ('PendingCall', 'Message', 'MethodCallMessage',
            'MESSAGE_TYPE_METHOD_RETURN', 'MESSAGE_TYPE_ERROR',
            'MESSAGE_TYPE_SIGNAL')
 
-from _dbus_bindings import PendingCall, Message, MethodCallMessage, \
-                           MethodReturnMessage, ErrorMessage, SignalMessage, \
-                           HANDLER_RESULT_HANDLED, \
-                           HANDLER_RESULT_NOT_YET_HANDLED, \
-                           MESSAGE_TYPE_INVALID, \
-                           MESSAGE_TYPE_METHOD_CALL, \
-                           MESSAGE_TYPE_METHOD_RETURN, \
-                           MESSAGE_TYPE_ERROR, \
-                           MESSAGE_TYPE_SIGNAL
+from _dbus_bindings import (
+    ErrorMessage, HANDLER_RESULT_HANDLED, HANDLER_RESULT_NOT_YET_HANDLED,
+    MESSAGE_TYPE_ERROR, MESSAGE_TYPE_INVALID, MESSAGE_TYPE_METHOD_CALL,
+    MESSAGE_TYPE_METHOD_RETURN, MESSAGE_TYPE_SIGNAL, Message,
+    MethodCallMessage, MethodReturnMessage, PendingCall, SignalMessage)
diff --git a/dbus/proxies.py b/dbus/proxies.py
index 51d8d9f..f9b2e4e 100644
--- a/dbus/proxies.py
+++ b/dbus/proxies.py
@@ -33,16 +33,18 @@ except ImportError:
 
 import _dbus_bindings
 from dbus._expat_introspect_parser import process_introspection_data
-from dbus.exceptions import MissingReplyHandlerException, MissingErrorHandlerException, IntrospectionParserException, DBusException
+from dbus.exceptions import (
+    DBusException, IntrospectionParserException, MissingErrorHandlerException,
+    MissingReplyHandlerException)
 
 __docformat__ = 'restructuredtext'
 
 
 _logger = logging.getLogger('dbus.proxies')
 
-from _dbus_bindings import LOCAL_PATH, \
-                           BUS_DAEMON_NAME, BUS_DAEMON_PATH, BUS_DAEMON_IFACE,\
-                           INTROSPECTABLE_IFACE
+from _dbus_bindings import (
+    BUS_DAEMON_IFACE, BUS_DAEMON_NAME, BUS_DAEMON_PATH, INTROSPECTABLE_IFACE,
+    LOCAL_PATH)
 
 
 class _DeferredMethod:
diff --git a/dbus/service.py b/dbus/service.py
index eebc949..bc7fe09 100644
--- a/dbus/service.py
+++ b/dbus/service.py
@@ -33,12 +33,12 @@ import threading
 import traceback
 
 import _dbus_bindings
-from dbus import SessionBus, Signature, Struct, validate_bus_name, \
-                 validate_object_path, INTROSPECTABLE_IFACE, ObjectPath
+from dbus import (
+    INTROSPECTABLE_IFACE, ObjectPath, SessionBus, Signature, Struct,
+    validate_bus_name, validate_object_path)
 from dbus.decorators import method, signal
-from dbus.exceptions import DBusException, \
-                            NameExistsException, \
-                            UnknownMethodException
+from dbus.exceptions import (
+    DBusException, NameExistsException, UnknownMethodException)
 from dbus.lowlevel import ErrorMessage, MethodReturnMessage, MethodCallMessage
 from dbus.proxies import LOCAL_PATH
 
diff --git a/dbus/types.py b/dbus/types.py
index d638a8e..3623437 100644
--- a/dbus/types.py
+++ b/dbus/types.py
@@ -3,8 +3,7 @@ __all__ = ('ObjectPath', 'ByteArray', 'Signature', 'Byte', 'Boolean',
            'Double', 'String', 'Array', 'Struct', 'Dictionary',
            'UTF8String', 'UnixFd')
 
-from _dbus_bindings import ObjectPath, ByteArray, Signature, Byte,\
-                           Int16, UInt16, Int32, UInt32,\
-                           Int64, UInt64, Dictionary, Array, \
-                           String, Boolean, Double, Struct, UTF8String, \
-                           UnixFd
+from _dbus_bindings import (
+    Array, Boolean, Byte, ByteArray, Dictionary, Double, Int16, Int32, Int64,
+    ObjectPath, Signature, String, Struct, UInt16, UInt32, UInt64, UTF8String,
+    UnixFd)