Merge lp:~kiwinote/software-center/init-without-dbus into lp:software-center

[Kiwinote]

see bug report for details

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-13 14:55:27 +0000
+++ debian/changelog	2010-08-20 15:17:44 +0000
@@ -1,3 +1,16 @@
+software-center (2.1.11) UNRELEASED; urgency=low
+
+  [ Kiwinote ]
+  * softwarecenter/__init__.py:
+    - don't import Application
+  * softwarecenter/db/application.py:
+    - only import get_install_backend when we actually need it (LP: #620011)
+  * softwarecenter/db/database.py,
+    test/test_appview.py:
+    - import Application from the correct location
+
+ -- Michael Vogt <[e-mail]>  Fri, 13 Aug 2010 16:46:13 +0200
+
 software-center (2.1.10) maverick; urgency=low
 
   [ Kiwinote ]
 
=== modified file 'softwarecenter/__init__.py'
--- softwarecenter/__init__.py	2010-07-08 08:11:34 +0000
+++ softwarecenter/__init__.py	2010-08-20 15:17:44 +0000
@@ -17,5 +17,3 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import locale
-
-from db.application import Application
 
=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2010-08-13 14:25:11 +0000
+++ softwarecenter/db/application.py	2010-08-20 15:17:44 +0000
@@ -28,7 +28,6 @@
 from gettext import gettext as _
 from mimetypes import guess_type
 from softwarecenter.apt.apthistory import get_apt_history
-from softwarecenter.backend import get_install_backend
 from softwarecenter.distro import get_distro
 from softwarecenter.enums import *
 from softwarecenter.utils import *
@@ -120,6 +119,7 @@
         self._cache = self._db._aptcache
         self._distro = get_distro()
         self._history = get_apt_history()
+        from softwarecenter.backend import get_install_backend
         self._backend = get_install_backend()
         # FIXME: why two error states ?
         self._error = None
 
=== modified file 'softwarecenter/db/database.py'
--- softwarecenter/db/database.py	2010-08-12 13:08:06 +0000
+++ softwarecenter/db/database.py	2010-08-20 15:17:44 +0000
@@ -23,7 +23,7 @@
 import re
 import string
 import xapian
-from softwarecenter import Application
+from softwarecenter.db.application import Application
 
 from softwarecenter.utils import *
 from softwarecenter.enums import *
 
=== modified file 'test/test_appview.py'
--- test/test_appview.py	2010-08-09 14:17:41 +0000
+++ test/test_appview.py	2010-08-20 15:17:44 +0000
@@ -8,8 +8,8 @@
 import unittest
 import shutil
 
-from softwarecenter import Application
 from softwarecenter.apt.aptcache import AptCache
+from softwarecenter.db.application import Application
 from softwarecenter.db.database import StoreDatabase
 from softwarecenter.view.appview import AppStore
 from softwarecenter.enums import *