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

[Michael Vogt]

This fixes the unicode/str crash in #967036 and adds a regression test. Its a rather unfortunate str/unicode
python issue we are hitting here. We use the utf8 encoded summary string as input for %s but we can't specify
a encoding in %s AFAIK so python will use "ascii" when calling str() on it and that fails. So we first need
to convert it back to unicode :/ The alternative would be to return a unicode translated object from get_hw_short_summary() but that would be inconsistent with what we do in other functions. I'm not overly happy with the current fix, but I don't better alternatives currently. Fortunately py3 will make this problem go away when everything is unicode (or bytes).

To test install language-pack-gnome-ru and run:
$ LANGUAGE=ru ./software-center darwinia
then you should see under the details that it requires a mouse ("мышь" in russia apparently :)

I also made the label selectable to be consistent with the other labels.

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

2963. By Kiwinote on 2012-04-12

trivial: pep8 fixes

2964. By Michael Vogt on 2012-04-12

merged lp:~gary-lasker/software-center/sorting-fix-lp969215

2965. By Kiwinote on 2012-04-12

* sc/ui/gtk3/widgets/apptreeview.py:
  - everyone tries to expand a category in the installed pane by clicking
    on the text rather than the expander arrow (LP: #877130)

[Gary Lasker (gary-lasker)]

Nice unicode magic! And thanks for the unit test. :)

Thank you, Michael!

review: Approve

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

2966. By Gary Lasker on 2012-04-13

* lp:~mvo/software-center/lp967036:
  - fix UnicodeDecodeError crash for apps with hardware
    requirements in the details view (LP: #967036)

=== modified file 'softwarecenter/hw.py'
--- softwarecenter/hw.py	2012-03-20 08:40:10 +0000
+++ softwarecenter/hw.py	2012-04-12 08:15:24 +0000
@@ -86,7 +86,7 @@
     # FIXME: deal with OPENGL_DRIVER_BLACKLIST_TAG as this needs rsplit(":")
     #        and a view of all available tags
     s = TAG_DESCRIPTION.get(tag)
-    return utf8(s)
+    return utf8(_(s))
 
 
 def get_hw_missing_long_description(tags):
@@ -107,7 +107,7 @@
     # ensure that the last \n is gone
     if s:
         s = s[:-1]
-    return utf8(s)
+    return utf8(_(s))
 
 
 def get_private_extensions_hardware_support_for_tags(tags):

=== modified file 'softwarecenter/ui/gtk3/widgets/labels.py'
--- softwarecenter/ui/gtk3/widgets/labels.py	2012-03-29 18:53:08 +0000
+++ softwarecenter/ui/gtk3/widgets/labels.py	2012-04-12 08:15:24 +0000
@@ -20,7 +20,6 @@
 from gettext import gettext as _
 
 from softwarecenter.hw import get_hw_short_description
-from softwarecenter.utils import utf8
 
 
 class HardwareRequirementsLabel(Gtk.HBox):
@@ -58,6 +57,7 @@
 
     def _build_ui(self):
         self._label = Gtk.Label()
+        self._label.set_selectable(True)
         self._label.show()
         self.pack_start(self._label, True, True, 0)
 
@@ -66,12 +66,16 @@
         sym = self.SUPPORTED_SYM[self.result]
         # we add a trailing
         if self.last_item:
-            s = self.LABEL_LAST_ITEM
+            label_text = self.LABEL_LAST_ITEM
         else:
-            s = self.LABEL
-        return _(s) % {
+            label_text = self.LABEL
+        short_descr = get_hw_short_description(self.tag)
+        return _(label_text) % {
             "sym": sym,
-            "hardware": _(utf8(get_hw_short_description(self.tag)))
+            # we need unicode() here instead of utf8 or str because
+            # the %s in "label_text" will cause str() to be called on the
+            # encoded string, but it will not know what encoding to use
+            "hardware": unicode(short_descr, "utf8", "ignore")
             }
 
     def set_hardware_requirement(self, tag, result):

=== modified file 'test/gtk3/test_widgets.py'
--- test/gtk3/test_widgets.py	2012-03-15 19:31:46 +0000
+++ test/gtk3/test_widgets.py	2012-04-12 08:15:24 +0000
@@ -9,12 +9,11 @@
 
 from testutils import setup_test_env, do_events
 setup_test_env()
+from softwarecenter.utils import utf8
 from softwarecenter.ui.gtk3.widgets.reviews import get_test_reviews_window
-
 from softwarecenter.ui.gtk3.widgets.labels import (
     HardwareRequirementsLabel, HardwareRequirementsBox)
 
-
 # window destory timeout
 TIMEOUT=100
 
@@ -145,6 +144,18 @@
         label.set_hardware_requirement('hardware::video:opengl', 'yes')
         self.assertEqual(len(label.get_children()), 1)
 
+    # regression test for bug #967036
+    @patch("softwarecenter.ui.gtk3.widgets.labels.get_hw_short_description")
+    def test_hardware_requirements_label_utf8(self, mock_get_hw):
+        magic_marker = u" \u1234 GPS"
+        mock_get_hw.return_value = utf8(magic_marker)
+        label = HardwareRequirementsLabel()
+        label.set_hardware_requirement('hardware::gps', 'yes')
+        self.assertEqual(
+            label.get_label(),
+            u"%s%s" % (HardwareRequirementsLabel.SUPPORTED_SYM["yes"],
+                       magic_marker))
+
     def test_hardware_requirements_box(self):
         box = HardwareRequirementsBox()
         # test empty