Merge lp:~mterry/ubuntu-sso-client/no-gettext-install into lp:ubuntu-sso-client

[Michael Terry]

Avoid breaking built-in _ with gettext.install, using translation instead.

See bug 1050061 for rationale.

[Michael Terry (mterry)]

(btw, I wasn't sure why you use unicode=True only in Python 2, but I kept that behavior, on the assumption it was important)

[dobey (dobey)]

Michael, there is no unicode argument to install in Python 3 it seems, and also no ugettext, and Python 3 strings default to unicode. So to support both 2 and 3, the code needed to do that (and needs to do what you've done in the patch here).

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntu_sso/utils/tests/test_ui.py'
--- ubuntu_sso/utils/tests/test_ui.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/tests/test_ui.py	2012-09-13 13:59:31 +0000
@@ -36,8 +36,20 @@
                                  is_correct_email)
 
 
+class GettextTestCase(TestCase):
+    """Test that we don't override builtins with gettext."""
+
+    def test_import(self):
+        """Test whether importing ui module defines _ as a builtin."""
+        # This module is already imported above, but just to make sure, since
+        # top imports may change over time.
+        import ubuntu_sso.utils.ui  # pylint: disable=W0612
+        with self.assertRaises(NameError):
+            _  # pylint: disable=W0104,E0602
+
+
 class GetPasswordStrengTestCase(TestCase):
-    """Test the function that returns the strengh of a password."""
+    """Test the function that returns the strength of a password."""
 
     def test_too_small_password(self):
         """Test the points given to a very small password."""

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-09-05 17:24:55 +0000
+++ ubuntu_sso/utils/ui.py	2012-09-13 13:59:31 +0000
@@ -35,11 +35,12 @@
 
 from ubuntu_sso.logger import setup_logging
 
-INSTALL_KWARGS = {}
+TRANSLATION = gettext.translation('ubuntu-sso-client', fallback=True)
 if sys.version_info < (3,):
-    INSTALL_KWARGS["unicode"] = True
+    _ = TRANSLATION.ugettext
+else:
+    _ = TRANSLATION.gettext
 
-gettext.install('ubuntu-sso-client', **INSTALL_KWARGS)
 logger = setup_logging('ubuntu_sso.utils.ui')