Merge lp:~gary-lasker/software-center/fix-lp920741-for-5.0 into lp:software-center/5.0

[Gary Lasker]

* lp:~gary-lasker/software-center/fix-lp920741-for-5.0:
   - fix UnicodeDecodeError when a commercial app's title contains
     a unicode character (LP: #920741)

This branch is targeted for Oneiric (the 5.0 branch), and contains a fix for a UnicodeDecodeError when a commercial app's name has a non-ascii character in it, bug 920741. It's a very simple fix and actually only involves a change to a logger info statement.

[lp:~gary-lasker/software-center/fix-lp920741-for-5.0]

2496. By Gary Lasker on 2012-06-27

add mvo's unit test

=== modified file 'softwarecenter/backend/installbackend_impl/aptd.py'
--- softwarecenter/backend/installbackend_impl/aptd.py	2011-09-29 18:26:52 +0000
+++ softwarecenter/backend/installbackend_impl/aptd.py	2012-06-27 19:33:18 +0000
@@ -497,12 +497,13 @@
         and finally installing the specified application once the
         package list reload has completed.
         """
-        self.emit("transaction-started", app.pkgname, app.appname, "FIXME-NEED-ID-HERE", TransactionTypes.INSTALL)
+        self.emit("transaction-started", app.pkgname, app.appname,
+                  "FIXME-NEED-ID-HERE", TransactionTypes.INSTALL)
         self._logger.info("add_repo_add_key_and_install_app() '%s' '%s' '%s'"% (
                 # re.sub() out the password from the log
                 re.sub("deb https://.*@", "", deb_line),
                 signing_key_id, 
-                app))
+                app.pkgname))
 
         if purchase:
             # pre-authenticate
@@ -566,7 +567,7 @@
             See _reload_for_commercial_repo_inline() for the actual work
             that is done
         """
-        self._logger.info("_reload_for_commercial_repo() %s" % app)
+        self._logger.info("_reload_for_commercial_repo() %s" % app.pkgname)
         # trigger inline_callbacked function
         self._reload_for_commercial_repo_defer(
             app, trans_metadata, sources_list)

=== modified file 'test/test_aptd.py'
--- test/test_aptd.py	2011-09-29 18:16:38 +0000
+++ test/test_aptd.py	2012-06-27 19:33:18 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 import os
 import sys
@@ -6,6 +7,7 @@
 
 
 sys.path.insert(0,"../")
+from softwarecenter.db.application import Application
 from softwarecenter.backend.installbackend_impl.aptd import AptdaemonBackend
 from defer import inline_callbacks
 
@@ -76,6 +78,22 @@
         addons_install = ["gimp-data-extras", "gimp-gutenprint"]
         addons_remove = ["gimp-plugin-registry"]
         yield self.aptd.apply_changes(pkgname, appname ,iconname, addons_install, addons_remove)
+        
+    @inline_callbacks
+    def _inline_add_repo_call(self):
+        deb_line = "deb https://foo"
+        signing_key_id = u"xxx"
+        app = Application(u"Elementals: The Magic Key™", "pkgname")
+        iconname = "iconname"
+        yield self.aptd.add_repo_add_key_and_install_app(
+            deb_line, signing_key_id, app, iconname, None, None)
+        
+    def test_add_repo_add_key_and_install_app(self):
+        from mock import patch
+        with patch.object(self.aptd._logger, "info") as mock:
+            self._inline_add_repo_call()
+            self.assertTrue(
+                mock.call_args[0][0].startswith("add_repo_add_key"))
 
 
 if __name__ == "__main__":