Fixing lots of minor bugs found by lint

[theonering] / src / connection_manager.py

diff --git a/src/connection_manager.py b/src/connection_manager.py
index 92a12ae..cddba2a 100644 (file)
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -1,12 +1,11 @@
 import logging
 
-import gobject
 import telepathy
 
 import constants
 import tp
-import gtk_toolbox
 import util.go_utils as gobject_utils
+import util.misc as misc_utils
 import connection
 
 
@@ -23,7 +22,7 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
                self._on_shutdown = shutdown_func
                _moduleLogger.info("Connection manager created")
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def GetParameters(self, proto):
                """
                For org.freedesktop.telepathy.ConnectionManager
@@ -71,11 +70,11 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
                """
                Terminates all connections. Must be called upon quit
                """
-               for connection in self._connections:
-                       connection.Disconnect()
+               for conn in self._connections:
+                       conn.Disconnect()
                _moduleLogger.info("Connection manager quitting")
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def _shutdown(self):
                if (
                        self._on_shutdown is not None and