Merge lp:~mvo/software-center/speedup2 into lp:software-center

[Michael Vogt]

This improves startup time on the rasberry pi and the atom based
netbook. Its about 1s quicker to show the window and 2s until its
visible on atom netbook

[lp:~mvo/software-center/speedup2]

3137. By Michael Vogt on 2012-08-30

softwarecenter/region.py: use lxml here as well

3138. By Michael Vogt on 2012-08-30

softwarecenter/region.py: delay import

[Gary Lasker (gary-lasker)]

review: Approve

=== modified file 'software-center'
--- software-center	2012-08-10 13:23:52 +0000
+++ software-center	2012-08-30 13:05:21 +0000
@@ -128,7 +128,8 @@
     Gtk.init_check(sys.argv)
 
     # create the app
-    from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3
+    with ExecutionTime("import SoftwareCenterApp"):
+        from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3
     with ExecutionTime("create SoftwareCenterApp"):
         app = SoftwareCenterAppGtk3(datadir, xapian_base_path, options, args)
 
 
=== modified file 'softwarecenter/i18n.py'
--- softwarecenter/i18n.py	2012-04-12 14:25:07 +0000
+++ softwarecenter/i18n.py	2012-08-30 13:05:21 +0000
@@ -74,12 +74,12 @@
 
 
 def langcode_to_name(langcode):
-    import xml.etree.ElementTree
+    from lxml import etree
     from gettext import dgettext
     for iso in ["iso_639_3", "iso_639"]:
         path = os.path.join("/usr/share/xml/iso-codes/", iso + ".xml")
         if os.path.exists(path):
-            root = xml.etree.ElementTree.parse(path)
+            root = etree.parse(path)
             xpath = ".//%s_entry[@part1_code='%s']" % (iso, langcode)
             match = root.find(xpath)
             if match is not None:
 
=== modified file 'softwarecenter/region.py'
--- softwarecenter/region.py	2012-03-15 10:43:13 +0000
+++ softwarecenter/region.py	2012-08-30 13:05:21 +0000
@@ -24,7 +24,7 @@
 import locale
 import logging
 import os
-import xml.etree.ElementTree
+
 from gettext import dgettext
 from gettext import gettext as _
 
@@ -42,12 +42,13 @@
 
 def get_region_name(countrycode):
     """ return translated region name from countrycode using iso3166 """
+    from lxml import etree
     # find translated name
     if countrycode:
         for iso in ["iso_3166", "iso_3166_2"]:
             path = os.path.join("/usr/share/xml/iso-codes/", iso + ".xml")
             if os.path.exists(path):
-                root = xml.etree.ElementTree.parse(path)
+                root = etree.parse(path)
                 xpath = ".//%s_entry[@alpha_2_code='%s']" % (iso, countrycode)
                 match = root.find(xpath)
                 if match is not None:
 
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-08-16 14:44:29 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-08-30 13:05:21 +0000
@@ -92,8 +92,10 @@
 import softwarecenter.ui.gtk3.dialogs as dialogs
 
 from softwarecenter.ui.gtk3.SimpleGtkbuilderApp import SimpleGtkbuilderApp
-from softwarecenter.ui.gtk3.panes.installedpane import InstalledPane
-from softwarecenter.ui.gtk3.panes.availablepane import AvailablePane
+with ExecutionTime("import InstalledPane"):
+    from softwarecenter.ui.gtk3.panes.installedpane import InstalledPane
+with ExecutionTime("import AvailablePane"):
+    from softwarecenter.ui.gtk3.panes.availablepane import AvailablePane
 from softwarecenter.ui.gtk3.panes.historypane import HistoryPane
 from softwarecenter.ui.gtk3.panes.globalpane import GlobalPane
 from softwarecenter.ui.gtk3.panes.pendingpane import PendingPane
 
=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
--- softwarecenter/ui/gtk3/panes/installedpane.py	2012-06-28 08:51:44 +0000
+++ softwarecenter/ui/gtk3/panes/installedpane.py	2012-08-30 13:05:21 +0000
@@ -40,7 +40,7 @@
 from softwarecenter.ui.gtk3.widgets.oneconfviews import OneConfViews
 from softwarecenter.ui.gtk3.widgets.spinner import SpinnerNotebook
 from softwarecenter.ui.gtk3.views.appview import AppView
-from softwarepane import SoftwarePane
+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
 
=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
--- softwarecenter/ui/gtk3/panes/softwarepane.py	2012-08-22 06:49:53 +0000
+++ softwarecenter/ui/gtk3/panes/softwarepane.py	2012-08-30 13:05:21 +0000
@@ -43,7 +43,6 @@
 from softwarecenter.ui.gtk3.widgets.searchaid import SearchAid
 
 from softwarecenter.ui.gtk3.views.appview import AppView
-from softwarecenter.ui.gtk3.views.appdetailsview import AppDetailsView
 
 from softwarecenter.ui.gtk3.session.displaystate import DisplayState
 
@@ -152,6 +151,9 @@
         self.scroll_details = Gtk.ScrolledWindow()
         self.scroll_details.set_policy(Gtk.PolicyType.AUTOMATIC,
                                         Gtk.PolicyType.AUTOMATIC)
+        # delayed import gives ~1s speedup until visible on the raspi
+        with ExecutionTime("import AppDetailsView"):
+            from softwarecenter.ui.gtk3.views.appdetailsview import AppDetailsView
         with ExecutionTime("SoftwarePane.AppDetailsView"):
             self.app_details_view = AppDetailsView(self.db,
                                                    self.distro,
 
=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
--- softwarecenter/ui/gtk3/views/purchaseview.py	2012-08-30 08:22:32 +0000
+++ softwarecenter/ui/gtk3/views/purchaseview.py	2012-08-30 13:05:21 +0000
@@ -33,7 +33,6 @@
 from softwarecenter.ui.gtk3.dialogs import show_accept_tos_dialog
 from softwarecenter.config import get_config
 from softwarecenter.ui.gtk3.utils import get_parent
-from softwarecenter.ui.gtk3.widgets.webkit import ScrolledWebkitWindow
 
 LOG = logging.getLogger(__name__)
 
@@ -111,6 +110,10 @@
 
     def init_view(self):
         if self.wk is None:
+            # delaying this import make the window appear on the raspi
+            # 3s quicker
+            from softwarecenter.ui.gtk3.widgets.webkit import (
+                ScrolledWebkitWindow)
             self.wk = ScrolledWebkitWindow()
             # automatically fill in the email in the login page
             self.wk.webkit.set_auto_insert_email(self.config.email)
@@ -186,6 +189,8 @@
         return True
 
     def _on_create_web_view(self, view, frame):
+        from softwarecenter.ui.gtk3.widgets.webkit import (
+                ScrolledWebkitWindow)
         win = Gtk.Window()
         win.set_size_request(400, 400)
         wk = ScrolledWebkitWindow(include_progress_ui=True)