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

[Michael Vogt]

Small branch to fix bug #1045330 to support the unity people

[Gary Lasker (gary-lasker)]

review: Approve

[Gary Lasker (gary-lasker)]

There are two FIXMEs right in this area of the code. I'll approve, but when will be pay off this technical debt?

[Michael Vogt (mvo)]

Thanks for your review. You raise a valid point here, so I addressed the FIXME in the dataprovider test in lp:~mvo/software-center/fix-fixme-lp1045330.

I assume that the second one you mentioned is about the FIXMEs around the currency handling in "price()"? This will need server side support before we can tackle those.

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2012-08-18 05:51:30 +0000
+++ softwarecenter/db/application.py	2012-09-04 09:20:25 +0000
@@ -597,6 +597,7 @@
             #        to format them here differently too, e.g.
             #        "US$ 1" but "1EUR"
             return "%s %s" % (currency, raw_price)
+        return ""
 
     @property
     def supported_distros(self):

=== modified file 'tests/test_dataprovider.py'
--- tests/test_dataprovider.py	2012-08-28 13:04:23 +0000
+++ tests/test_dataprovider.py	2012-09-04 09:20:25 +0000
@@ -34,6 +34,7 @@
         self.assertEqual(result["icon"], "accessories-text-editor")
         self.assertEqual(result["name"], "gedit")
         self.assertEqual(result["pkgname"], "gedit")
+        self.assertEqual(result["price"], "")
 
 
 if __name__ == "__main__":