Merge lp:~brian.curtin/ubuntu-sso-client/py3-unicode-part-3 into lp:ubuntu-sso-client

[Brian Curtin]

- Prepare codebase for transition to Python 3 with respect to Unicode usage

The third of three branches to complete the transition to a Unicode-safe Python 2 and Python 3 codebase.

[Brian Curtin (brian.curtin)]

There will be one test failure until lp:~brian.curtin/ubuntu-sso-client/remove-SyncTimestampChecker lands. test_server_date_sends_nocache_headers is the failing test.

[Alejandro J. Cura (alecu)]

I get a failure when merging this branch with trunk to do the review:

conflicts:
  Text conflict in ubuntu_sso/qt/tests/test_setup_account.py

----

After manually fixing that, all tests pass, but lint complains:

ubuntu_sso/utils/ui.py:
    38: [C0103] Invalid name "install_kwargs" (should match (([A-Z_][A-Z0-9_]*)|(__.*__))$)

----

Please resubmit this proposal (via the link at the top of the page) , having lp:~brian.curtin/ubuntu-sso-client/remove-SyncTimestampChecker as the prerequisite branch.

----

The code looks very good otherwise, and all tests pass.
Great branch!

review: Needs Fixing

[Brian Curtin (brian.curtin)]

This MP should now cover the three things Alejandro mentioned. Resubmitted MP with prereq branch, merged with trunk, fixed lint warning.

[lp:~brian.curtin/ubuntu-sso-client/py3-unicode-part-3]

991. By Brian Curtin on 2012-08-14

- Remove SyncTimestampChecker as it is no longer used.

[Alejandro J. Cura (alecu)]

There are still merge conflicts here:

600 +<<<<<<< TREE
601 +from __future__ import unicode_literals
602 +
603 +import cgi
604 +=======
605 +>>>>>>> MERGE-SOURCE

review: Needs Fixing

[lp:~brian.curtin/ubuntu-sso-client/py3-unicode-part-3]

992. By Brian Curtin on 2012-08-14

Merge lp:~brian.curtin/ubuntu-sso-client/py3-unicode-part-3

993. By Brian Curtin on 2012-08-14

Fix merge mishaps, yet again

[Alejandro J. Cura (alecu)]

+1

review: Approve

[Eric Casteleijn (thisfred)]

Looks good to me, though I wonder why a lot of the indentation is 8 spaces instead of 4.

review: Approve

=== modified file 'ubuntu_sso/qt/tests/show_gui.py'
--- ubuntu_sso/qt/tests/show_gui.py	2012-06-27 19:03:44 +0000
+++ ubuntu_sso/qt/tests/show_gui.py	2012-08-14 23:18:19 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Script that shows the qt gui."""
 
+from __future__ import unicode_literals
+
 import sys
 
 # pylint: disable=E1101,F0401,E0611
@@ -65,12 +67,12 @@
     client.cred_manager.connect_to_signal('AuthorizationDenied', found)
     client.cred_manager.connect_to_signal('CredentialsError', found)
 
-    yield client.cred_manager.login(u'Ubuntu Two',
+    yield client.cred_manager.login('Ubuntu Two',
         {
-            HELP_TEXT_KEY: u'This is a test help text.',
-            PING_URL_KEY: u'http://www.wikipedia.com/',
-            POLICY_URL_KEY: u'http://one.ubuntu.com/',
-            TC_URL_KEY: u'http://www.google.com/',
+            HELP_TEXT_KEY: 'This is a test help text.',
+            PING_URL_KEY: 'http://www.wikipedia.com/',
+            POLICY_URL_KEY: 'http://one.ubuntu.com/',
+            TC_URL_KEY: 'http://www.google.com/',
         })
     yield d
 

=== modified file 'ubuntu_sso/qt/tests/test_common.py'
--- ubuntu_sso/qt/tests/test_common.py	2012-06-22 20:52:26 +0000
+++ ubuntu_sso/qt/tests/test_common.py	2012-08-14 23:18:19 +0000
@@ -29,10 +29,13 @@
 # files in the program, then also delete it here.
 """Test the common functions."""
 
+from __future__ import unicode_literals
+
 from PyQt4 import QtGui
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
+from ubuntu_sso.utils import compat
 from ubuntu_sso.qt import (
     build_general_error_message,
     maybe_elide_text,
@@ -74,7 +77,7 @@
         password_assistance(self.line_edit, self.label_assistance)
         self.assertIn(
             BAD % PASSWORD_LENGTH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_long_password(self):
@@ -86,7 +89,7 @@
         password_assistance(self.line_edit, self.label_assistance)
         self.assertIn(
             GOOD % PASSWORD_LENGTH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_no_number_password(self):
@@ -98,7 +101,7 @@
         password_assistance(self.line_edit, self.label_assistance)
         self.assertIn(
             BAD % PASSWORD_DIGIT,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_number_password(self):
@@ -110,7 +113,7 @@
         password_assistance(self.line_edit, self.label_assistance)
         self.assertIn(
             GOOD % PASSWORD_DIGIT,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_no_uppercase_password(self):
@@ -122,7 +125,7 @@
         password_assistance(self.line_edit, self.label_assistance)
         self.assertIn(
             BAD % PASSWORD_UPPER,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_upper_password(self):
@@ -134,7 +137,7 @@
         password_assistance(self.line_edit, self.label_assistance)
         self.assertIn(
             GOOD % PASSWORD_UPPER,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_matching_passwords(self):
@@ -148,7 +151,7 @@
             self.line_edit_confirm, self.label_assistance)
         self.assertNotIn(
             BAD % PASSWORD_MATCH,
-            unicode(self.label_assistance.text()))
+            compat.text_type(self.label_assistance.text()))
 
     def test_not_matching_passwords(self):
         """Status when the passwords not match.
@@ -161,7 +164,7 @@
             self.line_edit_confirm, self.label_assistance)
         self.assertIn(
             BAD % PASSWORD_MATCH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_password_assistance_in_focus_length_correct(self):
@@ -171,15 +174,15 @@
         password_assistance(self.line_edit, self.label_assistance, NORMAL)
         self.assertIn(
             GOOD % PASSWORD_LENGTH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             NORMAL % PASSWORD_UPPER,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             NORMAL % PASSWORD_DIGIT,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_password_assistance_in_focus_with_upper(self):
@@ -189,15 +192,15 @@
         password_assistance(self.line_edit, self.label_assistance, NORMAL)
         self.assertIn(
             NORMAL % PASSWORD_LENGTH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             GOOD % PASSWORD_UPPER,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             NORMAL % PASSWORD_DIGIT,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_password_assistance_in_focus_with_number(self):
@@ -207,15 +210,15 @@
         password_assistance(self.line_edit, self.label_assistance, NORMAL)
         self.assertIn(
             NORMAL % PASSWORD_LENGTH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             NORMAL % PASSWORD_UPPER,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             GOOD % PASSWORD_DIGIT,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
     def test_password_assistance_in_focus_all_ok(self):
@@ -225,19 +228,19 @@
         password_assistance(self.line_edit, self.label_assistance, NORMAL)
         self.assertIn(
             GOOD % PASSWORD_LENGTH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             GOOD % PASSWORD_UPPER,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertIn(
             GOOD % PASSWORD_DIGIT,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
         self.assertNotIn(
             NORMAL % PASSWORD_MATCH,
-            unicode(self.label_assistance.text()),
+            compat.text_type(self.label_assistance.text()),
         )
 
 
@@ -276,7 +279,7 @@
 
         self.assertEqual(self.ui.toolTip(), '')
         self.assertEqual(self.ui.text(), text)
-        self.assertNotIn(u'\u2026', self.ui.text())
+        self.assertNotIn('\u2026', self.ui.text())
 
     def test_text_not_elided_if_equals_max_width(self):
         """If text is equal than max_width, do not elide."""
@@ -286,7 +289,7 @@
 
         self.assertEqual(self.ui.toolTip(), '')
         self.assertEqual(self.ui.text(), text)
-        self.assertNotIn(u'\u2026', self.ui.text())
+        self.assertNotIn('\u2026', self.ui.text())
 
     def test_text_elided_if_bigger_than_max_width(self):
         """If text is equal than max_width, do not elide."""
@@ -295,8 +298,8 @@
         maybe_elide_text(self.ui, text, self.max_width)
 
         self.assertEqual(self.ui.toolTip(), text)
-        expected = unicode(self.ui.text())
-        self.assertTrue(expected.endswith(u'\u2026'))
+        expected = compat.text_type(self.ui.text())
+        self.assertTrue(expected.endswith('\u2026'))
         self.assertTrue(text.startswith(expected[:-1]))
 
 

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-06-08 15:10:34 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-08-14 23:18:19 +0000
@@ -28,8 +28,11 @@
 # files in the program, then also delete it here.
 """Tests for the Setup Account page Qt UI."""
 
+from __future__ import unicode_literals
+
 from PyQt4 import QtGui, QtCore
 
+from ubuntu_sso.utils import compat
 from ubuntu_sso.qt import current_user_sign_in_page as gui
 from ubuntu_sso.qt.tests import (
     PageBaseTestCase,
@@ -66,13 +69,14 @@
 
     def test_unicode_in_forgotten_password_link(self):
         """Ensure that this label supports unicode."""
-        forgot_fr = u"J'ai oublié mon mot de passe"
+        forgot_fr = "J'ai oublié mon mot de passe"
         self.patch(gui, "FORGOTTEN_PASSWORD_BUTTON", forgot_fr)
         forgotten_text = gui.LINK_STYLE.format(link_url='#',
                             link_text=forgot_fr)
         self.ui._set_translated_strings()
-        self.assertEqual(unicode(self.ui.ui.forgot_password_label.text()),
-            forgotten_text)
+        self.assertEqual(
+                compat.text_type(self.ui.ui.forgot_password_label.text()),
+                forgotten_text)
 
     def test_set_translated_strings(self):
         """Test the translated string method."""
@@ -80,16 +84,18 @@
         self.assert_title_correct(expected)
         expected = gui.LOGIN_SUBTITLE % dict(app_name=self.app_name)
         self.assert_subtitle_correct(expected)
-        self.assertEqual(unicode(self.ui.ui.email_label.text()),
+        self.assertEqual(compat.text_type(self.ui.ui.email_label.text()),
             gui.EMAIL_LABEL)
-        self.assertEqual(unicode(self.ui.ui.password_label.text()),
+        self.assertEqual(compat.text_type(self.ui.ui.password_label.text()),
             gui.LOGIN_PASSWORD_LABEL)
         text = gui.LINK_STYLE.format(link_url='#',
                                      link_text=gui.FORGOTTEN_PASSWORD_BUTTON)
-        self.assertEqual(unicode(self.ui.ui.forgot_password_label.text()),
-            text)
-        self.assertEqual(unicode(self.ui.ui.sign_in_button.text()),
-            gui.SIGN_IN_BUTTON)
+        self.assertEqual(
+                compat.text_type(self.ui.ui.forgot_password_label.text()),
+                text)
+        self.assertEqual(
+                compat.text_type(self.ui.ui.sign_in_button.text()),
+                gui.SIGN_IN_BUTTON)
 
     def test_connect_ui(self):
         """Test the connect ui method."""

=== modified file 'ubuntu_sso/qt/tests/test_forgotten_password.py'
--- ubuntu_sso/qt/tests/test_forgotten_password.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_forgotten_password.py	2012-08-14 23:18:19 +0000
@@ -30,6 +30,7 @@
 
 from PyQt4 import QtCore
 
+from ubuntu_sso.utils import compat
 from ubuntu_sso.qt import forgotten_password_page as gui
 from ubuntu_sso.qt.tests import (
     PageBaseTestCase,
@@ -60,8 +61,9 @@
     def test_email_address(self):
         """Test the email_address property."""
         value = self.ui.email_address
-        self.assertEqual(value, unicode(self.ui.ui.email_line_edit.text()))
-        self.assertTrue(isinstance(value, unicode))
+        self.assertEqual(value,
+                         compat.text_type(self.ui.ui.email_line_edit.text()))
+        self.assertTrue(isinstance(value, compat.text_type))
 
     def test_send_button_clicked(self):
         """Test the send_button property."""
@@ -87,9 +89,10 @@
         subtitle = gui.FORGOTTEN_PASSWORD_SUBTITLE
         self.assert_subtitle_correct(subtitle.format(app_name=self.app_name))
 
-        self.assertEqual(unicode(self.ui.ui.email_address_label.text()),
-            gui.EMAIL_LABEL)
-        self.assertEqual(unicode(self.ui.ui.send_button.text()),
+        self.assertEqual(
+                compat.text_type(self.ui.ui.email_address_label.text()),
+                gui.EMAIL_LABEL)
+        self.assertEqual(compat.text_type(self.ui.ui.send_button.text()),
             gui.RESET_PASSWORD)
 
     def test_connect_ui(self):

=== modified file 'ubuntu_sso/qt/tests/test_reset_password.py'
--- ubuntu_sso/qt/tests/test_reset_password.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_reset_password.py	2012-08-14 23:18:19 +0000
@@ -32,6 +32,7 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     PASSWORD1_ENTRY,
     PASSWORD2_ENTRY,
@@ -86,11 +87,12 @@
         self.ui.initializePage()
         self.assert_title_correct(RESET_TITLE)
         self.assert_subtitle_correct(RESET_SUBTITLE)
-        self.assertEqual(unicode(self.ui.ui.password_label.text()),
+        self.assertEqual(compat.text_type(self.ui.ui.password_label.text()),
             PASSWORD1_ENTRY)
-        self.assertEqual(unicode(self.ui.ui.confirm_password_label.text()),
-            PASSWORD2_ENTRY)
-        self.assertEqual(unicode(self.ui.ui.reset_code.text()),
+        self.assertEqual(
+                compat.text_type(self.ui.ui.confirm_password_label.text()),
+                PASSWORD2_ENTRY)
+        self.assertEqual(compat.text_type(self.ui.ui.reset_code.text()),
             RESET_CODE_ENTRY)
 
     def test_focus_changed_password_visibility(self):

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-07-31 20:56:16 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-08-14 23:18:19 +0000
@@ -30,6 +30,7 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntu_sso.utils import compat
 from ubuntu_sso.tests import CAPTCHA_PATH
 
 from ubuntu_sso.qt import common, setup_account_page as gui
@@ -69,7 +70,7 @@
 
         self.ui.ui.refresh_label.linkActivated.emit('error')
 
-        message = unicode(self.ui.form_errors_label.text())
+        message = compat.text_type(self.ui.form_errors_label.text())
         self.assertEqual(message, ' ')
 
     def test_enable_setup_button_with_visible_check(self):
@@ -118,15 +119,15 @@
         self.ui.focus_changed(None, self.ui.ui.password_edit)
         self.assertIn(
             common.NORMAL % common.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
+            compat.text_type(self.ui.ui.password_assistance.text()),
         )
         self.assertIn(
             common.NORMAL % common.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
+            compat.text_type(self.ui.ui.password_assistance.text()),
         )
         self.assertIn(
             common.NORMAL % common.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
+            compat.text_type(self.ui.ui.password_assistance.text()),
         )
 
     def test_password_focus_gain(self):
@@ -221,16 +222,18 @@
         self.assertFalse(self.ui.captcha_received)
 
         # labels
-        self.assertEqual(unicode(self.ui.ui.name_label.text()),
+        self.assertEqual(compat.text_type(self.ui.ui.name_label.text()),
             gui.NAME_ENTRY)
-        self.assertEqual(unicode(self.ui.ui.email_label.text()),
+        self.assertEqual(compat.text_type(self.ui.ui.email_label.text()),
             gui.EMAIL)
-        self.assertEqual(unicode(self.ui.ui.confirm_email_label.text()),
-                         gui.RETYPE_EMAIL)
-        self.assertEqual(unicode(self.ui.ui.password_label.text()),
+        self.assertEqual(
+                compat.text_type(self.ui.ui.confirm_email_label.text()),
+                gui.RETYPE_EMAIL)
+        self.assertEqual(compat.text_type(self.ui.ui.password_label.text()),
             gui.PASSWORD)
-        self.assertEqual(unicode(self.ui.ui.confirm_password_label.text()),
-                         gui.RETYPE_PASSWORD)
+        self.assertEqual(
+                compat.text_type(self.ui.ui.confirm_password_label.text()),
+                gui.RETYPE_PASSWORD)
 
         # assistants
         self.assertFalse(self.ui.ui.name_assistance.isVisible())

=== modified file 'ubuntu_sso/qt/tests/test_ssl_dialog.py'
--- ubuntu_sso/qt/tests/test_ssl_dialog.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_ssl_dialog.py	2012-08-14 23:18:19 +0000
@@ -34,6 +34,7 @@
 
 from ubuntu_sso import USER_CANCELLATION, USER_SUCCESS
 from ubuntu_sso.qt import ssl_dialog
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
     SSL_APPNAME_HELP,
@@ -94,17 +95,18 @@
     def test_set_labels(self):
         """Test that the labels contain the correct info."""
         self.assertEqual(SSL_HEADER,
-                         unicode(self.dialog.ui.title_label.text()))
+                         compat.text_type(self.dialog.ui.title_label.text()))
         explanation = SSL_EXPLANATION % dict(domain=self.domain)
         intro = ssl_dialog.REASONS_TEMPLATE % dict(explanation=explanation,
                                               first_reason=SSL_FIRST_REASON,
                                               second_reason=SSL_SECOND_REASON,
                                               third_reason=SSL_THIRD_REASON)
-        self.assertEqual(intro, unicode(self.dialog.ui.intro_label.text()))
+        self.assertEqual(intro,
+                         compat.text_type(self.dialog.ui.intro_label.text()))
         self.assertEqual(SSL_NOT_SURE % dict(app_name=self.appname),
-                unicode(self.dialog.ui.not_sure_label.text()))
+                compat.text_type(self.dialog.ui.not_sure_label.text()))
         self.assertEqual(SSL_REMEMBER_DECISION,
-                unicode(self.dialog.ui.remember_checkbox.text()))
+                compat.text_type(self.dialog.ui.remember_checkbox.text()))
 
     def test_on_cancel_clicked(self):
         """Test the cancelation action."""
@@ -146,16 +148,16 @@
         self.assertIn('_on_cancel_clicked', called)
 
         self.assertEqual(CANCEL_BUTTON,
-                unicode(dialog.ui.cancel_button.text()))
+                compat.text_type(dialog.ui.cancel_button.text()))
         self.assertEqual(SSL_CONNECT_BUTTON,
-                unicode(dialog.ui.connect_button.text()))
+                compat.text_type(dialog.ui.connect_button.text()))
         self.assertEqual(SSL_HELP_BUTTON,
-                unicode(dialog.ui.help_button.text()))
+                compat.text_type(dialog.ui.help_button.text()))
 
     def test_set_expander(self):
         """Test that the expander is correctly set."""
         self.assertEqual(SSL_CERT_DETAILS,
-            unicode(self.dialog.expander.text()))
+            compat.text_type(self.dialog.expander.text()))
         self.assertNotEqual(None, self.dialog.expander.content)
         self.assertEqual(2, self.dialog.ui.expander_layout.indexOf(
                                                         self.dialog.expander))

=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-05-11 18:32:40 +0000
+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-08-14 23:18:19 +0000
@@ -41,6 +41,7 @@
     BaseTestCase,
     FakeOverlay,
 )
+from ubuntu_sso.utils import compat
 
 
 # is ok to access private method/attrs in tests
@@ -107,7 +108,7 @@
 
     def test_window_title(self):
         """Check the window title for the application."""
-        title = unicode(self.ui.windowTitle())
+        title = compat.text_type(self.ui.windowTitle())
         self.assertEqual(title, ubuntu_sso_wizard.WINDOW_TITLE)
 
 

=== modified file 'ubuntu_sso/tests/__init__.py'
--- ubuntu_sso/tests/__init__.py	2012-06-27 19:03:44 +0000
+++ ubuntu_sso/tests/__init__.py	2012-08-14 23:18:19 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Tests for the Ubuntu SSO library."""
 
+from __future__ import unicode_literals
+
 import os
 
 from collections import defaultdict
@@ -38,30 +40,30 @@
 
 from ubuntu_sso.keyring import get_token_name
 
-APP_NAME = u'I ♥ Ubuntu'
-CAPTCHA_ID = u'test ñiña'
+APP_NAME = 'I ♥ Ubuntu'
+CAPTCHA_ID = 'test ñiña'
 CAPTCHA_PATH = os.path.abspath(os.path.join(os.curdir, 'ubuntu_sso', 'tests',
                                             'files', 'captcha.png'))
-CAPTCHA_SOLUTION = u'william Byrd ñandú'
-EMAIL = u'[e-mail]'
-EMAIL_TOKEN = u'B2P☺ gtf'
+CAPTCHA_SOLUTION = 'william Byrd ñandú'
+EMAIL = '[e-mail]'
+EMAIL_TOKEN = 'B2P☺ gtf'
 GUI_EXE = 'ubuntu-sso-login-qt'
-HELP_TEXT = u'☛ Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' \
+HELP_TEXT = '☛ Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' \
 'Nam sed lorem nibh. Suspendisse gravida nulla non nunc suscipit pulvinar ' \
 'tempus ut augue. Morbi consequat, ligula a elementum pretium, ' \
 'dolor nulla tempus metus, sed viverra nisi risus non velit.'
-NAME = u'Juanito ☀ Pérez'
-PASSWORD = u'h3lloWorld☑ '
-PING_URL = u'http://localhost/ping-me/'
-POLICY_URL = u'http://localhost/policy/'
-RESET_PASSWORD_TOKEN = u'8G5Wtq'
-TOKEN = {u'consumer_key': u'xQ7xDAz',
-         u'consumer_secret': u'KzCJWCTNbbntwfyCKKjomJDzlgqxLy',
-         u'token_name': u'test',
-         u'token': u'GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo',
-         u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
+NAME = 'Juanito ☀ Pérez'
+PASSWORD = 'h3lloWorld☑ '
+PING_URL = 'http://localhost/ping-me/'
+POLICY_URL = 'http://localhost/policy/'
+RESET_PASSWORD_TOKEN = '8G5Wtq'
+TOKEN = {'consumer_key': 'xQ7xDAz',
+         'consumer_secret': 'KzCJWCTNbbntwfyCKKjomJDzlgqxLy',
+         'token_name': 'test',
+         'token': 'GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo',
+         'token_secret': 'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
 TOKEN_NAME = get_token_name(APP_NAME)
-TC_URL = u'http://localhost/'
+TC_URL = 'http://localhost/'
 WINDOW_ID = 5
 
 

=== modified file 'ubuntu_sso/tests/test_account.py'
--- ubuntu_sso/tests/test_account.py	2012-08-14 16:23:35 +0000
+++ ubuntu_sso/tests/test_account.py	2012-08-14 23:18:19 +0000
@@ -72,6 +72,7 @@
     TOKEN,
     TOKEN_NAME,
 )
+from ubuntu_sso.utils import compat
 
 
 CANT_RESET_PASSWORD_CONTENT = "CanNotResetPassowrdError: " \
@@ -87,7 +88,7 @@
 STATUS_EMAIL_OK = {'email': EMAIL}
 
 FAKE_NEW_CAPTCHA = {
-    'image_url': "file://" + unicode(CAPTCHA_PATH),
+    'image_url': "file://" + compat.text_type(CAPTCHA_PATH),
     'captcha_id': CAPTCHA_ID,
 }
 
@@ -195,7 +196,7 @@
     def check_all_kwargs_unicode(self, **kwargs):
         """Check that the values of all keyword arguments are unicode."""
         for (key, value) in kwargs.items():
-            if isinstance(value, str):
+            if isinstance(value, compat.binary_type):
                 raise AssertionError("Error: kwarg '%s' is non-unicode." % key)
 
     def restcall(self, method_name, **kwargs):

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-08-09 15:59:14 +0000
+++ ubuntu_sso/utils/__init__.py	2012-08-14 23:18:19 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Utility modules that may find use outside ubuntu_sso."""
 
+from __future__ import unicode_literals
+
 import os
 import sys
 
@@ -40,7 +42,7 @@
                         UI_PROXY_CREDS_DIALOG,
                         UI_SSL_DIALOG)
 from ubuntu_sso.logger import setup_logging
-from ubuntu_sso.utils import webclient
+from ubuntu_sso.utils import compat, webclient
 
 
 logger = setup_logging("ubuntu_sso.utils")
@@ -147,7 +149,7 @@
     """
     logger.info('Pinging server using url: %r, email: %r.',
                 url, email)
-    assert isinstance(url, unicode), 'Url %r must be unicode' % url
+    assert isinstance(url, compat.text_type), 'Url %r must be unicode' % url
 
     target_url = url
     try:
@@ -158,7 +160,7 @@
     if target_url == url:
         logger.debug('Original url (%r) could not be formatted, '
                      'appending email (%r).', url, email)
-        assert url.endswith(u'/'), 'Url %r must end with /.' % url
+        assert url.endswith('/'), 'Url %r must end with /.' % url
         target_url = url + email
 
     wc = webclient.webclient_factory()

=== modified file 'ubuntu_sso/utils/runner/glib.py'
--- ubuntu_sso/utils/runner/glib.py	2012-06-22 16:12:03 +0000
+++ ubuntu_sso/utils/runner/glib.py	2012-08-14 23:18:19 +0000
@@ -35,6 +35,7 @@
 # pylint: enable=E0611,F0401
 
 from ubuntu_sso.logger import setup_logging
+from ubuntu_sso.utils import compat
 
 logger = setup_logging("ubuntu_sso.utils.runner.glib")
 
@@ -81,10 +82,10 @@
 
     bytes_args = []
     for arg in args:
-        if isinstance(arg, unicode):
+        if isinstance(arg, compat.text_type):
             arg = arg.encode('utf-8')
-        if not isinstance(arg, basestring):
-            arg = str(arg)
+        if not isinstance(arg, compat.basestring):
+            arg = compat.binary_type(arg)
         bytes_args.append(arg)
 
     try:

=== modified file 'ubuntu_sso/utils/runner/tests/test_qt.py'
--- ubuntu_sso/utils/runner/tests/test_qt.py	2012-06-22 16:12:03 +0000
+++ ubuntu_sso/utils/runner/tests/test_qt.py	2012-08-14 23:18:19 +0000
@@ -33,7 +33,7 @@
 from PyQt4 import QtCore
 from twisted.internet import defer
 
-from ubuntu_sso.utils import runner
+from ubuntu_sso.utils import compat, runner
 from ubuntu_sso.utils.runner import qt
 from ubuntu_sso.utils.runner.tests.test_runner import SpawnProgramTestCase
 
@@ -80,7 +80,7 @@
             # subprocess expects bytes
             bytes_args = []
             for arg in args:
-                if isinstance(arg, unicode):
+                if isinstance(arg, compat.text_type):
                     arg = arg.encode('utf-8')
                 bytes_args.append(arg)
 

=== modified file 'ubuntu_sso/utils/runner/tests/test_runner.py'
--- ubuntu_sso/utils/runner/tests/test_runner.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tests/test_runner.py	2012-08-14 23:18:19 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Tests for the runner helper module."""
 
+from __future__ import unicode_literals
+
 import os
 
 from twisted.internet import defer
@@ -36,15 +38,15 @@
 from ubuntu_sso.utils import runner
 
 
-TEST_ME_DIR = u'test-me-more-♥'
+TEST_ME_DIR = 'test-me-more-♥'
 TEST_ME_DIR_BYTES = TEST_ME_DIR.encode('utf-8')
 
 
 class SpawnProgramTestCase(TestCase):
     """The test suite for the spawn_program method."""
 
-    args = (u'python', u'-c',
-            u'import os; os.system("mkdir %s")' % TEST_ME_DIR)
+    args = ('python', '-c',
+            'import os; os.system("mkdir %s")' % TEST_ME_DIR)
     use_reactor = True
     timeout = 3
 

=== modified file 'ubuntu_sso/utils/runner/tx.py'
--- ubuntu_sso/utils/runner/tx.py	2012-08-09 18:50:11 +0000
+++ ubuntu_sso/utils/runner/tx.py	2012-08-14 23:18:19 +0000
@@ -34,6 +34,7 @@
 from twisted.internet import utils
 
 from ubuntu_sso.logger import setup_logging
+from ubuntu_sso.utils import compat
 
 
 logger = setup_logging("ubuntu_sso.utils.runner.tx")
@@ -83,10 +84,10 @@
 
     bytes_args = []
     for arg in argv:
-        if isinstance(arg, unicode):
+        if isinstance(arg, compat.text_type):
             arg = arg.encode('utf-8')
-        if not isinstance(arg, basestring):
-            arg = str(arg)
+        if not isinstance(arg, compat.basestring):
+            arg = compat.binary_type(arg)
         bytes_args.append(arg)
 
     if program and not os.access(program, os.X_OK):

=== modified file 'ubuntu_sso/utils/tests/test_common.py'
--- ubuntu_sso/utils/tests/test_common.py	2012-08-08 21:08:22 +0000
+++ ubuntu_sso/utils/tests/test_common.py	2012-08-14 23:18:19 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Tests for the oauth_headers helper function."""
 
+from __future__ import unicode_literals
+
 import logging
 import sys
 
@@ -220,7 +222,7 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(PingUrlTestCase, self).setUp()
-        self.url = u'http://example.com/'
+        self.url = 'http://example.com/'
         self.wc = FakeWebclient()
         self.patch(utils.webclient, "webclient_factory",
                    lambda *args: self.wc)
@@ -251,7 +253,7 @@
     @defer.inlineCallbacks
     def test_ping_url_formatting(self):
         """The email is added as the first formatting argument."""
-        self.url = u'http://example.com/{email}/something/else'
+        self.url = 'http://example.com/{email}/something/else'
         yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
 
         expected = self.url.format(email=EMAIL)
@@ -262,7 +264,7 @@
     @defer.inlineCallbacks
     def test_ping_url_formatting_with_query_params(self):
         """The email is added as the first formatting argument."""
-        self.url = u'http://example.com/{email}?something=else'
+        self.url = 'http://example.com/{email}?something=else'
         yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
 
         expected = self.url.format(email=EMAIL)
@@ -273,7 +275,7 @@
     @defer.inlineCallbacks
     def test_ping_url_formatting_no_email_kwarg(self):
         """The email is added as the first formatting argument."""
-        self.url = u'http://example.com/{0}/yadda/?something=else'
+        self.url = 'http://example.com/{0}/yadda/?something=else'
         yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
 
         expected = self.url.format(EMAIL)
@@ -284,7 +286,7 @@
     @defer.inlineCallbacks
     def test_ping_url_formatting_no_format(self):
         """The email is appended if formatting could not be accomplished."""
-        self.url = u'http://example.com/yadda/'
+        self.url = 'http://example.com/yadda/'
         yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
 
         expected = self.url + EMAIL

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/ui.py	2012-08-14 23:18:19 +0000
@@ -31,11 +31,15 @@
 import argparse
 import re
 import gettext
+import sys
 
 from ubuntu_sso.logger import setup_logging
 
+INSTALL_KWARGS = {}
+if sys.version_info < (3,):
+    INSTALL_KWARGS["unicode"] = True
 
-gettext.install('ubuntu-sso-client', unicode=True)
+gettext.install('ubuntu-sso-client', **INSTALL_KWARGS)
 logger = setup_logging('ubuntu_sso.utils.ui')