Merge lp:~mvo/software-center/path-cleansweep into lp:software-center

[Michael Vogt]

As discussed on irc on friday this branch eliminates the passing
around of datadir/desktopdir or xapian dir. The softwarecenter.paths
module is used for this information now.

[Gary Lasker (gary-lasker)]

Hi Michael, at this point trunk has diverged somewhat dramatically. Would you mind fixing the conflicts, and then I will finish reviewing this? I don't mind doing it if you prefer, just let me know. Thanks!

Text conflict in softwarecenter/ui/gtk3/panes/availablepane.py
Text conflict in softwarecenter/ui/gtk3/views/lobbyview.py
Text conflict in tests/gtk3/test_catview.py
Text conflict in tests/gtk3/windows.py

review: Needs Fixing

[lp:~mvo/software-center/path-cleansweep]

3113. By Michael Vogt on 2012-09-18

merged trunk and resolved conflicts

[Michael Vogt (mvo)]

Conflicts resolved now.

review: Needs Resubmitting

[Gary Lasker (gary-lasker)]

review: Approve

=== modified file 'software-center'
--- software-center	2012-09-18 00:08:10 +0000
+++ software-center	2012-09-18 06:40:24 +0000
@@ -118,7 +118,7 @@
         Gtk.Widget.set_default_direction(Gtk.TextDirection.RTL)
 
     # check if running locally
-    (datadir, xapian_base_path) = mangle_paths_if_running_in_local_checkout()
+    mangle_paths_if_running_in_local_checkout()
 
     # ensure we can actually run
     Gtk.init_check(sys.argv)
@@ -127,7 +127,7 @@
     with ExecutionTime("import SoftwareCenterApp"):
         from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3
     with ExecutionTime("create SoftwareCenterApp"):
-        app = SoftwareCenterAppGtk3(datadir, xapian_base_path, options, args)
+        app = SoftwareCenterAppGtk3(options, args)
 
     # DEBUG/PROFILE mode
     if options.measure_startup_time:

=== modified file 'softwarecenter/db/categories.py'
--- softwarecenter/db/categories.py	2012-09-11 12:56:28 +0000
+++ softwarecenter/db/categories.py	2012-09-18 06:40:24 +0000
@@ -43,7 +43,6 @@
 from softwarecenter.db.appfilter import AppFilter
 from softwarecenter.db.enquire import AppEnquire
 from softwarecenter.db.utils import get_query_for_pkgnames
-from softwarecenter.paths import APP_INSTALL_PATH
 from softwarecenter.region import get_region_cached
 from softwarecenter.utils import utf8
 
@@ -81,7 +80,7 @@
 
 def get_query_for_category(db, untranslated_category_name):
     cat_parser = CategoriesParser(db)
-    categories = cat_parser.parse_applications_menu(APP_INSTALL_PATH)
+    categories = cat_parser.parse_applications_menu()
     for c in categories:
         if untranslated_category_name == c.untranslated_name:
             query = c.query
@@ -254,7 +253,7 @@
         """ parse a application menu and return a list of Category objects """
 
         if datadir is None:
-            datadir = softwarecenter.paths.APP_INSTALL_PATH
+            datadir = softwarecenter.paths.desktopdir
 
         # the DB must be part of the cache key because different DBs may
         # yield different results (e.g. in the tests)

=== modified file 'softwarecenter/paths.py'
--- softwarecenter/paths.py	2012-08-23 14:35:48 +0000
+++ softwarecenter/paths.py	2012-09-18 06:40:24 +0000
@@ -34,9 +34,6 @@
 #                 xdg_cache_home=os.path.expanduser("~/.cache"))
 from xdg import BaseDirectory as xdg
 
-# global datadir, this maybe overriden at startup
-datadir = "/usr/share/software-center/"
-
 # system pathes
 APP_INSTALL_PATH = "/usr/share/app-install"
 APP_INSTALL_DESKTOP_PATH = APP_INSTALL_PATH + "/desktop/"
@@ -70,10 +67,16 @@
 APT_XAPIAN_INDEX_UPDATE_STAMP_PATH = (APT_XAPIAN_INDEX_BASE_PATH +
                                       "/update-timestamp")
 
+
+# global datadirs, this maybe overriden at startup
+datadir = "/usr/share/software-center/"
+desktopdir = APP_INSTALL_PATH
+xapiandir = XAPIAN_BASE_PATH
+
+
 # OEM
 OEM_CHANNEL_DESCRIPTOR = "/var/lib/ubuntu-dist-channel"
 
-
 # apport
 APPORT_RECOVERABLE_ERROR = "/usr/share/apport/recoverable_problem"
 

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-09-14 13:44:38 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-09-18 06:40:24 +0000
@@ -257,16 +257,16 @@
 
     START_DBUS = True
 
-    def __init__(self, datadir, xapian_base_path, options, args=None):
+    def __init__(self, options, args=None):
         self.dbusControler = None
         if self.START_DBUS:
             # setup dbus and exit if there is another instance already running
             self.setup_dbus_or_bring_other_instance_to_front(args)
 
-        self.datadir = datadir
+        self.datadir = softwarecenter.paths.datadir
         super(SoftwareCenterAppGtk3, self).__init__(
-                                     datadir + "/ui/gtk3/SoftwareCenter.ui",
-                                     "software-center")
+            os.path.join(self.datadir, "ui", "gtk3", "SoftwareCenter.ui"),
+            "software-center")
         gettext.bindtextdomain("software-center", "/usr/share/locale")
         gettext.textdomain("software-center")
 
@@ -291,6 +291,7 @@
             # cache is opened later in run()
             self.cache.connect("cache-broken", self._on_apt_cache_broken)
 
+        xapian_base_path = softwarecenter.paths.XAPIAN_BASE_PATH
         with ExecutionTime("opening the xapiandb"):
             pathname = os.path.join(xapian_base_path, "xapian")
             self._use_axi = not options.disable_apt_xapian_index
@@ -314,13 +315,13 @@
                 dialogs.error(None,
                               _("Sorry, can not open the software database"),
                               _("Please re-install the 'software-center' "
-                                "package."))
+                               "package."))
                 # FIXME: force rebuild by providing a dbus service for this
                 sys.exit(1)
 
         # additional icons come from app-install-data
         with ExecutionTime("building the icon cache"):
-            self.icons = get_sc_icon_theme(self.datadir)
+            self.icons = get_sc_icon_theme()
 
         # backend
         with ExecutionTime("creating the backend"):
@@ -352,23 +353,21 @@
         # initial css loading
         init_sc_css_provider(self.window_main,
                              settings,
-                             Gdk.Screen.get_default(),
-                             datadir)
+                             Gdk.Screen.get_default())
 
         # wire up the css provider to reconfigure on theme-changes
         self.window_main.connect("style-updated",
                                  self._on_style_updated,
                                  init_sc_css_provider,
                                  settings,
-                                 Gdk.Screen.get_default(),
-                                 datadir)
+                                 Gdk.Screen.get_default())
 
         # register view manager and create view panes/widgets
         self.view_manager = ViewManager(self.notebook_view, options)
 
         with ExecutionTime("building panes"):
-            self.global_pane = GlobalPane(self.view_manager, self.datadir,
-                self.db, self.cache, self.icons)
+            self.global_pane = GlobalPane(self.view_manager, self.db,
+                                          self.cache, self.icons)
             self.vbox1.pack_start(self.global_pane, False, False, 0)
             self.vbox1.reorder_child(self.global_pane, 1)
 
@@ -381,7 +380,6 @@
                                                 self.db,
                                                 self.distro,
                                                 self.icons,
-                                                self.datadir,
                                                 self.navhistory_back_action,
                                                 self.navhistory_forward_action)
             self.available_pane.connect("available-pane-created",
@@ -393,8 +391,7 @@
             self.installed_pane = InstalledPane(self.cache,
                                                 self.db,
                                                 self.distro,
-                                                self.icons,
-                                                self.datadir)
+                                                self.icons)
             self.installed_pane.connect("installed-pane-created",
                 self.on_installed_pane_created)
             self.view_manager.register(self.installed_pane,
@@ -404,8 +401,7 @@
             self.history_pane = HistoryPane(self.cache,
                                             self.db,
                                             self.distro,
-                                            self.icons,
-                                            self.datadir)
+                                            self.icons)
             self.view_manager.register(self.history_pane, ViewPages.HISTORY)
 
             # pending pane

=== modified file 'softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py'
--- softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py	2012-03-15 01:39:09 +0000
+++ softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py	2012-09-18 06:40:24 +0000
@@ -95,7 +95,7 @@
         datadir = "/usr/share/software-center"
 
     from softwarecenter.ui.gtk3.utils import get_sc_icon_theme
-    icons = get_sc_icon_theme(datadir)
+    icons = get_sc_icon_theme()
 
     Gtk.Window.set_default_icon_name("softwarecenter")
 

=== modified file 'softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py'
--- softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py	2012-05-30 18:39:55 +0000
+++ softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py	2012-09-18 06:40:24 +0000
@@ -21,6 +21,7 @@
 
 from gettext import gettext as _
 
+import softwarecenter.paths
 from softwarecenter.ui.gtk3.dialogs import SimpleGtkbuilderDialog
 
 from softwarecenter.distro import get_distro
@@ -36,7 +37,7 @@
 _DIALOG = None
 
 
-def confirm_install(parent, datadir, app, db, icons):
+def confirm_install(parent, app, db, icons):
     """Confirm install of the given app
 
        (currently only shows a dialog if a installed app needs to be removed
@@ -53,11 +54,11 @@
         return True
     (primary, button_text) = distro.get_install_warning_text(cache,
         appdetails.pkg, app.name, depends)
-    return _confirm_internal(parent, datadir, app, db, icons, primary,
+    return _confirm_internal(parent, app, db, icons, primary,
         button_text, depends, cache)
 
 
-def confirm_remove(parent, datadir, app, db, icons):
+def confirm_remove(parent, app, db, icons):
     """ Confirm removing of the given app """
     cache = db._aptcache
     distro = get_distro()
@@ -73,13 +74,14 @@
         return True
     (primary, button_text) = distro.get_removal_warning_text(
         db._aptcache, appdetails.pkg, app.name, depends)
-    return _confirm_internal(parent, datadir, app, db, icons, primary,
+    return _confirm_internal(parent, app, db, icons, primary,
         button_text, depends, cache)
 
 
-def _get_confirm_internal_dialog(parent, datadir, app, db, icons, primary,
+def _get_confirm_internal_dialog(parent, app, db, icons, primary,
     button_text, depends, cache):
-    glade_dialog = SimpleGtkbuilderDialog(datadir, domain="software-center")
+    glade_dialog = SimpleGtkbuilderDialog(
+        softwarecenter.paths.datadir, domain="software-center")
     dialog = glade_dialog.dialog_dependency_alert
     dialog.set_resizable(True)
     dialog.set_transient_for(parent)

=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
--- softwarecenter/ui/gtk3/models/appstore2.py	2012-09-11 04:16:01 +0000
+++ softwarecenter/ui/gtk3/models/appstore2.py	2012-09-18 06:40:24 +0000
@@ -40,7 +40,6 @@
 from softwarecenter.backend.reviews import get_review_loader
 from softwarecenter.paths import SOFTWARE_CENTER_ICON_CACHE_DIR
 
-import softwarecenter.paths
 from softwarecenter.db.categories import (
     category_subcat, category_cat, CategoriesParser)
 
@@ -106,8 +105,7 @@
         # get all categories
         cat_parser = CategoriesParser(db)
         with ExecutionTime("cat_parser.parse_applications_menu()"):
-            self.all_categories = cat_parser.parse_applications_menu(
-                softwarecenter.paths.APP_INSTALL_PATH)
+            self.all_categories = cat_parser.parse_applications_menu()
 
         # reviews stats loader
         self.review_loader = get_review_loader(cache, db)

=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-09-17 15:15:32 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-09-18 06:40:24 +0000
@@ -37,8 +37,6 @@
     DEFAULT_SEARCH_LIMIT,
     TransactionTypes,
 )
-from softwarecenter.paths import APP_INSTALL_PATH
-
 from softwarecenter.utils import (
     convert_desktop_file_to_installed_location,
     is_no_display_desktop_file,
@@ -97,11 +95,10 @@
                  db,
                  distro,
                  icons,
-                 datadir,
                  navhistory_back_action,
                  navhistory_forward_action):
         # parent
-        SoftwarePane.__init__(self, cache, db, distro, icons, datadir)
+        SoftwarePane.__init__(self, cache, db, distro, icons)
         self.searchentry.set_sensitive(False)
         # navigation history actions
         self.navhistory_back_action = navhistory_back_action
@@ -171,25 +168,18 @@
         self.scroll_categories = Gtk.ScrolledWindow()
         self.scroll_categories.set_policy(Gtk.PolicyType.AUTOMATIC,
                                         Gtk.PolicyType.AUTOMATIC)
-        with ExecutionTime("create LobbyView"):
-            self.cat_view = LobbyView(self.datadir, APP_INSTALL_PATH,
-                                       self.cache,
-                                       self.db,
-                                       self.icons,
-                                       self.apps_filter)
+        with ExecutionTime("create LobbyViewGtk"):
+            self.cat_view = LobbyView(
+                self.cache, self.db, self.icons, self.apps_filter)
         self.scroll_categories.add(self.cat_view)
         self.notebook.append_page(self.scroll_categories,
             Gtk.Label(label="categories"))
 
         # sub-categories view
-        with ExecutionTime("create SubCategoryView"):
-            self.subcategories_view = SubCategoryView(self.datadir,
-            APP_INSTALL_PATH,
-            self.cache,
-            self.db,
-            self.icons,
-            self.apps_filter,
-            root_category=self.cat_view.categories[0])
+        with ExecutionTime("create SubCategoryViewGtk"):
+            self.subcategories_view = SubCategoryView(
+                self.cache, self.db, self.icons, self.apps_filter,
+                root_category=self.cat_view.categories[0])
         self.subcategories_view.connect(
             "category-selected", self.on_subcategory_activated)
         self.subcategories_view.connect(

=== modified file 'softwarecenter/ui/gtk3/panes/globalpane.py'
--- softwarecenter/ui/gtk3/panes/globalpane.py	2012-05-30 18:39:55 +0000
+++ softwarecenter/ui/gtk3/panes/globalpane.py	2012-09-18 06:40:24 +0000
@@ -14,7 +14,7 @@
 
 class GlobalPane(Gtk.Toolbar):
 
-    def __init__(self, view_manager, datadir, db, cache, icons):
+    def __init__(self, view_manager, db, cache, icons):
         Gtk.Toolbar.__init__(self)
         context = self.get_style_context()
         context.add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
@@ -42,7 +42,7 @@
         self._insert_as_tool_item(self.back_forward, 0)
 
         # this is what actually draws the All Software, Installed etc buttons
-        self.view_switcher = ViewSwitcher(view_manager, datadir, db, cache,
+        self.view_switcher = ViewSwitcher(view_manager, db, cache,
             icons)
         self._insert_as_tool_item(self.view_switcher, 1)
 

=== modified file 'softwarecenter/ui/gtk3/panes/historypane.py'
--- softwarecenter/ui/gtk3/panes/historypane.py	2012-08-22 06:49:53 +0000
+++ softwarecenter/ui/gtk3/panes/historypane.py	2012-09-18 06:40:24 +0000
@@ -58,13 +58,12 @@
     (PAGE_HISTORY_VIEW,
      PAGE_SPINNER) = range(2)
 
-    def __init__(self, cache, db, distro, icons, datadir):
+    def __init__(self, cache, db, distro, icons):
         Gtk.VBox.__init__(self)
         self.cache = cache
         self.db = db
         self.distro = distro
         self.icons = icons
-        self.datadir = datadir
 
         self.apps_filter = None
         self.state = DisplayState()

=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
--- softwarecenter/ui/gtk3/panes/installedpane.py	2012-08-30 12:37:38 +0000
+++ softwarecenter/ui/gtk3/panes/installedpane.py	2012-09-18 06:40:24 +0000
@@ -43,7 +43,6 @@
 from softwarecenter.ui.gtk3.panes.softwarepane import SoftwarePane
 from softwarecenter.backend.oneconfhandler import get_oneconf_handler
 from softwarecenter.db.appfilter import AppFilter
-from softwarecenter.paths import APP_INSTALL_PATH
 
 LOG = logging.getLogger(__name__)
 
@@ -89,11 +88,11 @@
                                                None,
                                                ())}
 
-    def __init__(self, cache, db, distro, icons, datadir):
+    def __init__(self, cache, db, distro, icons):
 
         # parent
-        SoftwarePane.__init__(self, cache, db, distro, icons, datadir,
-            show_ratings=False)
+        SoftwarePane.__init__(self, cache, db, distro, icons,
+                              show_ratings=False)
         CategoriesParser.__init__(self, db)
 
         self.current_appview_selection = None
@@ -200,7 +199,7 @@
         self.app_view.tree_view.connect("row-collapsed",
             self._on_row_collapsed)
 
-        self._all_cats = self.parse_applications_menu(APP_INSTALL_PATH)
+        self._all_cats = self.parse_applications_menu()
         self._all_cats = categories_sorted_by_name(self._all_cats)
 
         # we do not support the search aid feature in the installedview

=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
--- softwarecenter/ui/gtk3/panes/softwarepane.py	2012-08-31 03:43:19 +0000
+++ softwarecenter/ui/gtk3/panes/softwarepane.py	2012-09-18 06:40:24 +0000
@@ -68,7 +68,7 @@
     }
     PADDING = 6
 
-    def __init__(self, cache, db, distro, icons, datadir, show_ratings=True):
+    def __init__(self, cache, db, distro, icons, show_ratings=True):
 
         Gtk.VBox.__init__(self)
         BasePane.__init__(self)
@@ -82,7 +82,6 @@
         self.db = db
         self.distro = distro
         self.icons = icons
-        self.datadir = datadir
         self.show_ratings = show_ratings
         self.backend = get_install_backend()
         self.nonapps_visible = NonAppVisibility.MAYBE_VISIBLE
@@ -159,8 +158,7 @@
             self.app_details_view = AppDetailsView(self.db,
                                                    self.distro,
                                                    self.icons,
-                                                   self.cache,
-                                                   self.datadir)
+                                                   self.cache)
         self.app_details_view.connect(
             "different-application-selected", self.on_application_activated)
         self.scroll_details.add(self.app_details_view)

=== modified file 'softwarecenter/ui/gtk3/panes/viewswitcher.py'
--- softwarecenter/ui/gtk3/panes/viewswitcher.py	2012-05-30 18:39:55 +0000
+++ softwarecenter/ui/gtk3/panes/viewswitcher.py	2012-09-18 06:40:24 +0000
@@ -44,7 +44,7 @@
 
     ICON_SIZE = Gtk.IconSize.LARGE_TOOLBAR
 
-    def __init__(self, view_manager, datadir, db, cache, icons):
+    def __init__(self, view_manager, db, cache, icons):
         # boring stuff
         self.view_manager = view_manager
 

=== modified file 'softwarecenter/ui/gtk3/session/appmanager.py'
--- softwarecenter/ui/gtk3/session/appmanager.py	2012-04-16 21:51:02 +0000
+++ softwarecenter/ui/gtk3/session/appmanager.py	2012-09-18 06:40:24 +0000
@@ -34,7 +34,6 @@
 from softwarecenter.backend.transactionswatcher import (
     TransactionFinishedResult,
 )
-import softwarecenter.paths
 
 _appmanager = None  # the global AppManager instance
 
@@ -59,7 +58,6 @@
         self.db = db
         self.backend = backend
         self.distro = get_distro()
-        self.datadir = softwarecenter.paths.datadir
         self.icons = icons
         self.oauth_token = ""
 
@@ -86,7 +84,7 @@
         appdetails = app.get_details(self.db)
         if action == AppActions.REMOVE:
             if not dependency_dialogs.confirm_remove(
-                        None, self.datadir, app, self.db, self.icons):
+                        None, app, self.db, self.icons):
                     # craft an instance of TransactionFinishedResult to send
                     # with the transaction-stopped signal
                     result = TransactionFinishedResult(None, False)
@@ -98,7 +96,7 @@
             # also be removed and show a dialog for confirmation
             # generic removal text (fixing LP bug #554319)
             if not dependency_dialogs.confirm_install(
-                        None, self.datadir, app, self.db, self.icons):
+                        None, app, self.db, self.icons):
                     # craft an instance of TransactionFinishedResult to send
                     # with the transaction-stopped signal
                     result = TransactionFinishedResult(None, False)

=== modified file 'softwarecenter/ui/gtk3/utils.py'
--- softwarecenter/ui/gtk3/utils.py	2012-08-07 13:15:08 +0000
+++ softwarecenter/ui/gtk3/utils.py	2012-09-18 06:40:24 +0000
@@ -23,6 +23,7 @@
 
 from gi.repository import Gtk
 
+import softwarecenter.paths
 from softwarecenter.paths import ICON_PATH, SOFTWARE_CENTER_ICON_CACHE_DIR
 
 LOG = logging.getLogger(__name__)
@@ -47,7 +48,8 @@
             rect.y <= py <= rect.y + rect.height)
 
 
-def init_sc_css_provider(toplevel, settings, screen, datadir):
+def init_sc_css_provider(toplevel, settings, screen):
+    datadir = softwarecenter.paths.datadir
     context = toplevel.get_style_context()
     theme_name = settings.get_property("gtk-theme-name").lower()
 
@@ -89,8 +91,9 @@
     return css_path
 
 
-def get_sc_icon_theme(datadir):
+def get_sc_icon_theme():
     # additional icons come from app-install-data
+    datadir = softwarecenter.paths.datadir
     icons = Gtk.IconTheme.get_default()
     icons.append_search_path(ICON_PATH)
     icons.append_search_path(os.path.join(datadir, "icons"))

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-09-05 20:36:07 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-09-18 06:40:24 +0000
@@ -803,7 +803,7 @@
                         (GObject.TYPE_PYOBJECT, )),
                     }
 
-    def __init__(self, db, distro, icons, cache, datadir):
+    def __init__(self, db, distro, icons, cache):
         Viewport.__init__(self)
         # basic stuff
         self.db = db
@@ -815,7 +815,7 @@
         self.backend = get_install_backend()
         self.cache.connect("cache-ready", self._on_cache_ready)
         self.connect("destroy", self._on_destroy)
-        self.datadir = datadir
+        self.datadir = softwarecenter.paths.datadir
         self.app = None
         self.appdetails = None
         self.addons_to_install = []

=== modified file 'softwarecenter/ui/gtk3/views/catview.py'
--- softwarecenter/ui/gtk3/views/catview.py	2012-09-17 15:17:48 +0000
+++ softwarecenter/ui/gtk3/views/catview.py	2012-09-18 06:40:24 +0000
@@ -80,8 +80,6 @@
                            "ui/gtk3/art/stipple.png")
 
     def __init__(self,
-                 datadir,
-                 desktopdir,
                  cache,
                  db,
                  icons,
@@ -90,14 +88,11 @@
 
         """ init the widget, takes
 
-        datadir - the base directory of the app-store data
-        desktopdir - the dir where the applications.menu file can be found
         db - a Database object
         icons - a Gtk.IconTheme
         apps_filter - ?
         apps_limit - the maximum amount of items to display to query for
         """
-
         self.cache = cache
         self.db = db
         self.icons = icons
@@ -193,10 +188,10 @@
 
 class SubCategoryView(CategoriesView):
 
-    def __init__(self, datadir, desktopdir, cache, db, icons,
+    def __init__(self, cache, db, icons,
                  apps_filter, apps_limit=0, root_category=None):
-        CategoriesView.__init__(self, datadir, desktopdir, cache, db, icons,
-                                apps_filter, apps_limit)
+        CategoriesView.__init__(self, cache, db, icons, apps_filter,
+                                apps_limit)
         # state
         self._built = False
         # data

=== modified file 'softwarecenter/ui/gtk3/views/lobbyview.py'
--- softwarecenter/ui/gtk3/views/lobbyview.py	2012-09-17 15:17:48 +0000
+++ softwarecenter/ui/gtk3/views/lobbyview.py	2012-09-18 06:40:24 +0000
@@ -62,10 +62,10 @@
 
 class LobbyView(CategoriesView):
 
-    def __init__(self, datadir, desktopdir, cache, db, icons,
+    def __init__(self, cache, db, icons,
                  apps_filter, apps_limit=0):
-        CategoriesView.__init__(self, datadir, desktopdir, cache, db, icons,
-                                apps_filter, apps_limit=0)
+        CategoriesView.__init__(self, cache, db, icons, apps_filter,
+                                apps_limit=0)
         self.top_rated = None
         self.exhibit_banner = None
 
@@ -75,8 +75,7 @@
 
         # get categories
         self.categories_parser = CategoriesParser(db)
-        self.categories = self.categories_parser.parse_applications_menu(
-            desktopdir)
+        self.categories = self.categories_parser.parse_applications_menu()
 
         # build before connecting the signals to avoid race
         self.build()

=== modified file 'softwarecenter/ui/qml/categoriesmodel.py'
--- softwarecenter/ui/qml/categoriesmodel.py	2012-03-07 20:08:53 +0000
+++ softwarecenter/ui/qml/categoriesmodel.py	2012-09-18 06:40:24 +0000
@@ -33,7 +33,6 @@
 from softwarecenter.db.database import StoreDatabase
 from softwarecenter.db.pkginfo import get_pkg_info
 from softwarecenter.paths import XAPIAN_BASE_PATH
-import softwarecenter.paths
 
 
 class CategoriesModel(QAbstractListModel):
@@ -55,8 +54,7 @@
         db.open()
         # /FIXME
         self.catparser = CategoriesParser(db)
-        self._categories = self.catparser.parse_applications_menu(
-            softwarecenter.paths.APP_INSTALL_PATH)
+        self._categories = self.catparser.parse_applications_menu()
 
     # QAbstractListModel code
     def rowCount(self, parent=QModelIndex()):

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-09-11 04:16:01 +0000
+++ softwarecenter/utils.py	2012-09-18 06:40:24 +0000
@@ -729,6 +729,7 @@
         xapian_base_path = datadir
         # set new global datadir
         softwarecenter.paths.datadir = datadir
+        softwarecenter.paths.XAPIAN_BASE_PATH = xapian_base_path
         # also alter the app-install path
         path = "./build/share/app-install/desktop/software-center.menu"
         if os.path.exists(path):

=== modified file 'tests/gtk3/test_app.py'
--- tests/gtk3/test_app.py	2012-07-19 09:29:16 +0000
+++ tests/gtk3/test_app.py	2012-09-18 06:40:24 +0000
@@ -16,7 +16,6 @@
 
 setup_test_env()
 
-import softwarecenter.paths
 from softwarecenter.db import DebFileApplication, DebFileOpenError
 from softwarecenter.enums import PkgStates, SearchSeparators
 from softwarecenter.ui.gtk3 import app
@@ -210,10 +209,8 @@
         self.addCleanup(setattr, app, 'get_pkg_info', orig)
         app.get_pkg_info = lambda: FakedCache()
 
-        datadir = softwarecenter.paths.datadir
-        xapianpath = softwarecenter.paths.XAPIAN_BASE_PATH
         options = get_mock_options()
-        self.app = app.SoftwareCenterAppGtk3(datadir, xapianpath, options)
+        self.app = app.SoftwareCenterAppGtk3(options)
         self.addCleanup(self.app.destroy)
 
         self.app.cache.open()

=== modified file 'tests/gtk3/test_catview.py'
--- tests/gtk3/test_catview.py	2012-09-18 00:08:10 +0000
+++ tests/gtk3/test_catview.py	2012-09-18 06:40:24 +0000
@@ -91,8 +91,7 @@
 
         apps_filter = AppFilter(db, cache)
 
-        view = lobbyview.LobbyView(softwarecenter.paths.datadir,
-            softwarecenter.paths.APP_INSTALL_PATH, cache, db, icons,
+        view = lobbyview.LobbyView(cache, db, icons,
             softwarecenter.distro.get_distro(), apps_filter)
         view.show()
 
@@ -377,13 +376,10 @@
     """The test suite for the exhibits carousel."""
 
     def setUp(self):
-        self.datadir = softwarecenter.paths.datadir
-        self.desktopdir = softwarecenter.paths.APP_INSTALL_PATH
         self.cache = FakedCache()
         self.db = StoreDatabase(cache=self.cache)
-        self.lobby = lobbyview.LobbyView(datadir=self.datadir,
-            desktopdir=self.desktopdir, cache=self.cache, db=self.db,
-            icons=None, apps_filter=None)
+        self.lobby = lobbyview.LobbyView(cache=self.cache, db=self.db,
+                                         icons=None, apps_filter=None)
         self.addCleanup(self.lobby.destroy)
 
     def _get_banner_from_lobby(self):

=== modified file 'tests/gtk3/test_debfile_view.py'
--- tests/gtk3/test_debfile_view.py	2012-05-30 18:39:55 +0000
+++ tests/gtk3/test_debfile_view.py	2012-09-18 06:40:24 +0000
@@ -8,7 +8,6 @@
 )
 setup_test_env()
 
-import softwarecenter.paths
 from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3
 from softwarecenter.ui.gtk3.panes.availablepane import AvailablePane
 
@@ -17,9 +16,7 @@
 
     def test_deb_file_view_error(self):
         mock_options = get_mock_options()
-        xapianpath = softwarecenter.paths.XAPIAN_BASE_PATH
-        app = SoftwareCenterAppGtk3(
-            softwarecenter.paths.datadir, xapianpath, mock_options)
+        app = SoftwareCenterAppGtk3(mock_options)
         app.run(["./data/test_debs/gdebi-test1.deb"])
         # give it time
         for i in range(10):

=== modified file 'tests/gtk3/test_memleak.py'
--- tests/gtk3/test_memleak.py	2012-09-07 13:34:37 +0000
+++ tests/gtk3/test_memleak.py	2012-09-18 06:40:24 +0000
@@ -20,7 +20,6 @@
     TraceMemoryUsage,
     )
 
-from softwarecenter import paths
 from tests.gtk3.windows import (
     get_test_window_appdetails,
     get_test_window_catview,
@@ -90,15 +89,13 @@
                 do_events_with_sleep()
 
     def test_memleak_app(self):
-        datadir = paths.datadir
-        xapian_base_path = paths.XAPIAN_BASE_PATH
         options = Mock()
         options.display_navlog = False
         args = []
         # ensure the cache is fully ready before taking the baseline
         cache = get_pkg_info()
         cache.open(blocking=True)
-        app = SoftwareCenterAppGtk3(datadir, xapian_base_path, options, args)
+        app = SoftwareCenterAppGtk3(options, args)
         app.window_main.show_all()
         do_events_with_sleep()
         with TraceMemoryUsage("app._on_transaction_finished"):

=== modified file 'tests/gtk3/test_purchase.py'
--- tests/gtk3/test_purchase.py	2012-09-14 13:31:29 +0000
+++ tests/gtk3/test_purchase.py	2012-09-18 06:40:24 +0000
@@ -9,8 +9,6 @@
 )
 setup_test_env()
 
-import softwarecenter.paths
-
 from softwarecenter.ui.gtk3.views import purchaseview
 from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3
 from softwarecenter.ui.gtk3.panes.availablepane import AvailablePane
@@ -79,9 +77,7 @@
     def test_reinstall_previous_purchase_display(self, mock_find_token):
         mock_find_token.return_value = { 'not': 'important' }
         mock_options = get_mock_options()
-        xapiandb = "/var/cache/software-center/"
-        app = SoftwareCenterAppGtk3(
-            softwarecenter.paths.datadir, xapiandb, mock_options)
+        app = SoftwareCenterAppGtk3(mock_options)
         self.addCleanup(app.destroy)
         # real app opens cache async
         app.cache.open()

=== modified file 'tests/gtk3/windows.py'
--- tests/gtk3/windows.py	2012-09-18 04:37:10 +0000
+++ tests/gtk3/windows.py	2012-09-18 06:40:24 +0000
@@ -74,7 +74,6 @@
 from tests.utils import (
     do_events,
     get_test_categories,
-    get_test_datadir,
     get_test_db,
     get_test_gtk3_icon_cache,
     get_test_gtk3_viewmanager,
@@ -130,7 +129,7 @@
     primary = "primary text"
     button_text = "button_text"
     dia = dependency_dialogs._get_confirm_internal_dialog(
-        parent=None, datadir=softwarecenter.paths.datadir, app=app,
+        parent=None, app=app,
         db=db, icons=icons, primary=primary, button_text=button_text,
         depends=depends, cache=db._aptcache)
     return dia
@@ -142,7 +141,7 @@
     db = get_test_db()
     app = application.Application("", "p7zip-full")
     return dependency_dialogs.confirm_remove(None,
-        softwarecenter.paths.datadir, app, db, icons)
+        app, db, icons)
 
 
 def get_query_from_search_entry(search_term):
@@ -254,7 +253,6 @@
     assert vm is not None
     db = get_test_db()
     cache = get_test_pkg_info()
-    datadir = get_test_datadir()
     icons = get_test_gtk3_icon_cache()
     backend = get_test_install_backend()
 
@@ -268,7 +266,7 @@
     navhistory_forward_action = Gtk.Action("navhistory_forward_action",
         "Forward", "Forward", None)
 
-    w = availablepane.AvailablePane(cache, db, 'Ubuntu', icons, datadir,
+    w = availablepane.AvailablePane(cache, db, 'Ubuntu', icons,
         navhistory_back_action, navhistory_forward_action)
     w.init_view()
     w.show()
@@ -284,10 +282,9 @@
     vm = get_test_gtk3_viewmanager()
     db = get_test_db()
     cache = get_test_pkg_info()
-    datadir = get_test_datadir()
     icons = get_test_gtk3_icon_cache()
 
-    p = globalpane.GlobalPane(vm, datadir, db, cache, icons)
+    p = globalpane.GlobalPane(vm, db, cache, icons)
 
     win = get_test_window(child=p)
     win.set_data("pane", p)
@@ -313,10 +310,9 @@
     cache = get_test_pkg_info()
     db = get_test_db()
     icons = get_test_gtk3_icon_cache()
-    datadir = get_test_datadir()
     manager = get_test_gtk3_viewmanager()
 
-    view = viewswitcher.ViewSwitcher(manager, datadir, db, cache, icons)
+    view = viewswitcher.ViewSwitcher(manager, db, cache, icons)
 
     scroll = Gtk.ScrolledWindow()
     box = Gtk.VBox()
@@ -333,10 +329,9 @@
     vm  # make pyflakes happy
     db = get_test_db()
     cache = get_test_pkg_info()
-    datadir = get_test_datadir()
     icons = get_test_gtk3_icon_cache()
 
-    w = installedpane.InstalledPane(cache, db, 'Ubuntu', icons, datadir)
+    w = installedpane.InstalledPane(cache, db, 'Ubuntu', icons)
     w.show()
 
     # init the view
@@ -360,7 +355,7 @@
     cache = get_test_pkg_info()
     icons = get_test_gtk3_icon_cache()
 
-    widget = historypane.HistoryPane(cache, db, None, icons, None)
+    widget = historypane.HistoryPane(cache, db, None, icons)
     widget.show()
 
     win = get_test_window(child=widget)
@@ -411,17 +406,14 @@
     else:
         cache = db._aptcache
 
-    datadir = softwarecenter.paths.datadir
-    icons = get_sc_icon_theme(datadir)
+    icons = get_sc_icon_theme()
     distro = softwarecenter.distro.get_distro()
     apps_filter = appfilter.AppFilter(db, cache)
 
     # gui
     notebook = Gtk.Notebook()
 
-    lobby_view = lobbyview.LobbyView(softwarecenter.paths.datadir,
-        softwarecenter.paths.APP_INSTALL_PATH,
-        cache, db, icons, distro, apps_filter)
+    lobby_view = lobbyview.LobbyView(cache, db, icons, distro, apps_filter)
 
     scroll = Gtk.ScrolledWindow()
     scroll.add(lobby_view)
@@ -437,8 +429,7 @@
             subcat_cat = cat
             break
 
-    subcat_view = catview.SubCategoryView(datadir,
-        softwarecenter.paths.APP_INSTALL_PATH, cache, db, icons, apps_filter)
+    subcat_view = catview.SubCategoryView(cache, db, icons, apps_filter)
     subcat_view.connect("category-selected", on_category_selected)
     subcat_view.set_subcategory(subcat_cat)
 
@@ -465,14 +456,11 @@
     db = database.StoreDatabase(pathname, cache)
     db.open()
 
-    datadir = softwarecenter.paths.datadir
-    icons = get_sc_icon_theme(datadir)
+    icons = get_sc_icon_theme()
     distro = softwarecenter.distro.get_distro()
     apps_filter = appfilter.AppFilter(db, cache)
 
-    cat_view = lobbyview.LobbyView(softwarecenter.paths.datadir,
-        softwarecenter.paths.APP_INSTALL_PATH,
-        cache, db, icons, distro, apps_filter)
+    cat_view = lobbyview.LobbyView(cache, db, icons, distro, apps_filter)
 
     return cat_view
 
@@ -486,13 +474,12 @@
     db = database.StoreDatabase(pathname, cache)
     db.open()
 
-    datadir = softwarecenter.paths.datadir
-    icons = get_sc_icon_theme(datadir)
+    icons = get_sc_icon_theme()
     distro = softwarecenter.distro.get_distro()
 
     # gui
     scroll = Gtk.ScrolledWindow()
-    view = appdetailsview.AppDetailsView(db, distro, icons, cache, datadir)
+    view = appdetailsview.AppDetailsView(db, distro, icons, cache)
 
     if pkgname is None:
         pkgname = "totem"
@@ -527,8 +514,7 @@
     db = database.StoreDatabase(pathname, cache)
     db.open()
 
-    datadir = softwarecenter.paths.datadir
-    icons = get_sc_icon_theme(datadir)
+    icons = get_sc_icon_theme()
     pkgs = ["apt", "software-center"]
     view = pkgnamesview.PackageNamesView("header", cache, pkgs, icons, 32, db)
     view.show()
@@ -1061,7 +1047,7 @@
     distro = softwarecenter.distro.get_distro()
 
     init_sc_css_provider(win, Gtk.Settings.get_default(),
-                         Gdk.Screen.get_default(), "data")
+                         Gdk.Screen.get_default())
 
     t = thumbnail.ScreenshotGallery(distro, icons)
     t.connect('draw', t.draw)

=== modified file 'tests/utils.py'
--- tests/utils.py	2012-09-12 07:27:54 +0000
+++ tests/utils.py	2012-09-18 06:40:24 +0000
@@ -149,7 +149,7 @@
 
 
 def get_test_gtk3_icon_cache():
-    icons = get_sc_icon_theme(softwarecenter.paths.datadir)
+    icons = get_sc_icon_theme()
     return icons
 
 
@@ -165,8 +165,7 @@
 
 def get_test_categories(db):
     parser = CategoriesParser(db)
-    cats = parser.parse_applications_menu(
-        softwarecenter.paths.APP_INSTALL_PATH)
+    cats = parser.parse_applications_menu()
     return cats