Merge lp:~nataliabidart/ubuntu-sso-client/fix-939173 into lp:ubuntu-sso-client

[Natalia Bidart]

- Do not mask ImportError by importing inside a function (LP: #939173).

[Roberto Alsina (ralsina)]

Looks good to me!

review: Approve

=== modified file 'ubuntu_sso/main/glib.py'
--- ubuntu_sso/main/glib.py	2012-01-26 14:54:13 +0000
+++ ubuntu_sso/main/glib.py	2012-02-23 13:33:20 +0000
@@ -18,6 +18,10 @@
 
 # pylint: disable=E0611,F0401
 
+# pylint: disable=W0621
+import dbus.mainloop.glib
+# pylint: enable=W0621
+
 from gi.repository import GLib, Gdk, Gtk
 
 
@@ -38,8 +42,6 @@
 
 def start_setup():
     """Setup the env to run the service."""
-    import dbus.mainloop.glib  # pylint: disable=W0621
-
     dbus.mainloop.glib.threads_init()
     Gdk.threads_init()
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)

=== modified file 'ubuntu_sso/main/qt.py'
--- ubuntu_sso/main/qt.py	2012-02-17 19:43:31 +0000
+++ ubuntu_sso/main/qt.py	2012-02-23 13:33:20 +0000
@@ -20,8 +20,13 @@
 
 import sys
 
+# pylint: disable=W0621
+import dbus.mainloop.qt
+# pylint: enable=W0621
+
 from PyQt4 import QtCore
 
+
 TIMERS = set()
 
 
@@ -55,12 +60,9 @@
 
 def start_setup():
     """Setup the env to run the service."""
-    import dbus.mainloop.qt  # pylint: disable=W0621
-
     # this has to be created before calling dbus.mainloop.qt.DBusQtMainLoop
     loop = QtCore.QCoreApplication(sys.argv)
     dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
-
     return loop