Merge lp:~mvo/software-center/remove-iso3166-support into lp:software-center

[Michael Vogt]

This removes the support for a region warning (iso3166:: debtag) from the UI as MPT feels like this should be done in the description rather than with the explicit code we are using for this currently.

[Michael Vogt (mvo)]

I put this on hold again, the rational is that we do have interesst from a customer in
such a feature.

review: Needs Fixing

Unmerged revisions

2803. By Michael Vogt on 2012-03-02

pyflake fix

2802. By Michael Vogt on 2012-03-02

remove region requirements warning after talking to mpt about it. he thinks it should be part of the description instead

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-02-27 16:05:43 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-03-02 09:40:27 +0000
@@ -76,7 +76,6 @@
 import softwarecenter.ui.gtk3.dialogs as dialogs
 
 from softwarecenter.hw import get_hw_missing_long_description
-from softwarecenter.region import REGION_WARNING_STRING
 
 from softwarecenter.backend.reviews import get_review_loader
 from softwarecenter.backend import get_install_backend
@@ -378,8 +377,7 @@
             #        won't vary based on locale and as such we don't want
             #        it translated
             self.set_label("US$ %s" % app_details.price)
-            if (app_details.hardware_requirements_satisfied and
-                app_details.region_requirements_satisfied):
+            if app_details.hardware_requirements_satisfied:
                 self.set_button_label(_(u'Buy\u2026'))
             else:
                 self.set_button_label(_(u'Buy Anyway\u2026'))
@@ -413,8 +411,7 @@
             else:
                 # TRANSLATORS: Free here means Gratis
                 self.set_label(_("Free"))
-            if (app_details.hardware_requirements_satisfied and
-                app_details.region_requirements_satisfied):
+            if app_details.hardware_requirements_satisfied:
                 self.set_button_label(_('Install'))
             else:
                 self.set_button_label(_('Install Anyway'))
@@ -1454,17 +1451,11 @@
             self.pkg_warningbar.show()
             self.pkg_warningbar.label.set_text(app_details.error)
             return
-        if (app_details.hardware_requirements_satisfied and
-            app_details.region_requirements_satisfied):
+        if app_details.hardware_requirements_satisfied:
             self.pkg_warningbar.hide()
         else:
             s = get_hw_missing_long_description(
                 app_details.hardware_requirements)
-            if not app_details.region_requirements_satisfied:
-                if len(s) > 0:
-                    s += "\n"+REGION_WARNING_STRING
-                else:
-                    s = REGION_WARNING_STRING
             self.pkg_warningbar.label.set_text(s)
             self.pkg_warningbar.show()
 

=== modified file 'test/gtk3/test_appdetailsview.py'
--- test/gtk3/test_appdetailsview.py	2012-02-23 16:40:27 +0000
+++ test/gtk3/test_appdetailsview.py	2012-03-02 09:40:27 +0000
@@ -15,7 +15,6 @@
 from softwarecenter.ui.gtk3.widgets.labels import HardwareRequirementsBox
 from softwarecenter.ui.gtk3.views.appdetailsview import get_test_window_appdetails
 from softwarecenter.enums import PkgStates
-from softwarecenter.region import REGION_WARNING_STRING
 
 from test.test_database import make_purchased_app_details
 
@@ -386,46 +385,6 @@
         # check if the warning bar is invisible
         self.assertFalse(self.view.pkg_warningbar.get_property("visible"))
 
-class RegionRequirementsTestCase(unittest.TestCase):
-    
-    @classmethod
-    def setUpClass(cls):
-        # Set these as class attributes as we don't modify either
-        # during the tests.
-        from softwarecenter.testutils import get_test_db
-        cls.db = get_test_db()
-        cls.win = get_test_window_appdetails()
-        cls.view = cls.win.get_data("view")
-
-    @classmethod
-    def tearDownClass(cls):
-        GObject.timeout_add(TIMEOUT, lambda: cls.win.destroy())
-        Gtk.main()
-
-    def setUp(self):
-        app = Application("", "software-center")
-        self.app_mock = get_mock_app_from_real_app(app)
-        self.app_mock.details.pkg_state = PkgStates.UNINSTALLED
-
-    def test_show_region_requirements(self):
-        self.app_mock.details.region_requirements_satisfied = False
-        self.view.show_app(self.app_mock)
-        do_events()
-        # ensure that the button is correct
-        self.assertEqual(
-            self.view.pkg_statusbar.button.get_label(), "Install Anyway")
-        # and again for purchase
-        self.app_mock.details.pkg_state = PkgStates.NEEDS_PURCHASE
-        self.view.show_app(self.app_mock)
-        self.assertEqual(
-            self.view.pkg_statusbar.button.get_label(), 
-            _(u"Buy Anyway\u2026").encode("utf-8"))
-        # check if the warning bar is displayed
-        self.assertTrue(self.view.pkg_warningbar.get_property("visible"))
-        self.assertEqual(self.view.pkg_warningbar.label.get_text(),
-                         REGION_WARNING_STRING)
-
-
 class PurchasedAppDetailsStatusBarTestCase(unittest.TestCase):
 
     @classmethod