Merge lp:~dobey/aptdaemon/fix-imports into lp:aptdaemon

[dobey]

Check that the item in sys.modules is not None before trying to import it

=== modified file 'aptdaemon/client.py'
--- aptdaemon/client.py	2012-07-12 14:08:43 +0000
+++ aptdaemon/client.py	2012-08-09 19:00:27 +0000
@@ -37,7 +37,7 @@
 import dbus.mainloop.glib
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
-if 'gobject' in sys.modules:
+if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
     import gobject as GObject
 else:
     from gi.repository import GObject

=== modified file 'aptdaemon/debconf.py'
--- aptdaemon/debconf.py	2011-11-25 00:23:33 +0000
+++ aptdaemon/debconf.py	2012-08-09 19:00:27 +0000
@@ -35,7 +35,7 @@
 import tempfile
 import sys
 
-if 'gi.repository' in sys.modules:
+if 'gi.repository' in sys.modules and sys.modules['gi.repository'] is not None:
     from gi.repository import GObject
 else:
     import gobject as GObject