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

[Brian Curtin]

The second of three changes to prepare SSO for Python 3 Unicode usage.

The second of three branches to prepare for Python 3's Unicode usage. This merge proposal mostly contains changes from unicode construction to the compat.text_type wrapper. There are a few StringIO changes, and only a few changes to Unicode literals. It is a follow-up to lp:~brian.curtin/ubuntu-sso-client/py3-unicode

This change covers modules in the following packages:
ubuntu_sso.qt
ubuntu_sso.main

[Alejandro J. Cura (alecu)]

Code looks fine, and all tests pass.
While trying to test it IRL I get stuck with the progress dialog when creating a new account; but since this currently happens with both trunk and nightlies, it looks like it's not a problem with this code.

review: Approve

[Mike McCracken (mikemc)]

Tests pass, but IRL on darwin the captcha fails to work because it needs to use io.BytesIO instead of io.StringIO in ubuntu_sso/qt/setup_account_page.py

With that tweak, everything works for me.

Here's the traceback, for reference:
  File "/Users/mmccrack/Documents/Canonical/Source/ubuntuone-windows-installer/scripts/devsetup/parts/sso-client-py3-unicode/ubuntu_sso/qt/setup_account_page.py", line 333, in on_captcha_generated
    pil_image.save(string_io, format='png')
  File "/Users/mmccrack/Documents/Canonical/Source/ubuntuone-windows-installer/scripts/devsetup/eggs/PIL-1.1.7-py2.7-macosx-10.7-intel.egg/Image.py", line 1439, in save
    save_handler(self, fp, filename)
  File "/Users/mmccrack/Documents/Canonical/Source/ubuntuone-windows-installer/scripts/devsetup/eggs/PIL-1.1.7-py2.7-macosx-10.7-intel.egg/PngImagePlugin.py", line 514, in _save
    fp.write(_MAGIC)
exceptions.TypeError: string argument expected, got 'str'

review: Needs Fixing

[Mike McCracken (mikemc)]

per discussion in IRC, we'll fix the stringIO thing in a separate branch

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~brian.curtin/ubuntu-sso-client/py3-unicode has not yet been merged into https://code.launchpad.net/~ubuntuone-control-tower/ubuntu-sso-client/trunk.

=== modified file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	2012-06-27 19:03:44 +0000
+++ ubuntu_sso/qt/__init__.py	2012-07-30 18:07:25 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """The Qt graphical interface for the Ubuntu Single Sign On Client."""
 
+from __future__ import unicode_literals
+
 import sys
 import collections
 
@@ -38,13 +40,13 @@
 
 logger = setup_gui_logging('ubuntu_sso.qt')
 
-LINK_STYLE = (u'<a href="{link_url}">'
+LINK_STYLE = ('<a href="{link_url}">'
               '<span style="color:#df2d1f;">{link_text}</span></a>')
 ERROR_ALL = '__all__'
-ERROR_STYLE = u'<font color="#df2d1f" style="font-size:small"><b>%s</b></font>'
+ERROR_STYLE = '<font color="#df2d1f" style="font-size:small"><b>%s</b></font>'
 ERROR_MESSAGE = 'message'
 PREFERED_UI_SIZE = {'width': 550, 'height': 525}
-TITLE_STYLE = u'<span style="font-size:xx-large;font-weight:bold;">%s</span>'
+TITLE_STYLE = '<span style="font-size:xx-large;font-weight:bold;">%s</span>'
 WINDOW_TITLE = 'Ubuntu Single Sign On'
 
 # TODO: There is a pixel discrepancy between Qt on Linux and Windows

=== modified file 'ubuntu_sso/qt/common.py'
--- ubuntu_sso/qt/common.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/common.py	2012-07-30 18:07:25 +0000
@@ -30,8 +30,11 @@
 # files in the program, then also delete it here.
 """Common functionality used by the UI modules."""
 
+from __future__ import unicode_literals
+
 import re
 
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     PASSWORD_DIGIT,
     PASSWORD_LENGTH,
@@ -41,14 +44,14 @@
 )
 
 # all the text + styles that are used in the gui
-BAD = u'<img src=":/password_hint_warning.png" /><small> %s </small>'
-GOOD = u'<img src=":/password_hint_ok.png" /><small> %s </small>'
-NORMAL = u'<small> %s </small>'
+BAD = '<img src=":/password_hint_warning.png" /><small> %s </small>'
+GOOD = '<img src=":/password_hint_ok.png" /><small> %s </small>'
+NORMAL = '<small> %s </small>'
 
 
 def password_assistance(line_edit, assistance, icon_type=BAD):
     """Show help for the password field."""
-    text1 = unicode(line_edit.text())
+    text1 = compat.text_type(line_edit.text())
     label_text = ["<b>%s</b>" % PASSWORD_MUST_CONTAIN, ]
 
     if len(text1) < 8:
@@ -75,9 +78,9 @@
 def password_check_match(line_edit, line_edit_confirm, assistance):
     """Check if passwords match, otherwise show a message."""
     password_assistance(line_edit, assistance)
-    label_text = unicode(assistance.text())
-    text1 = unicode(line_edit.text())
-    text2 = unicode(line_edit_confirm.text())
+    label_text = compat.text_type(assistance.text())
+    text1 = compat.text_type(line_edit.text())
+    text2 = compat.text_type(line_edit_confirm.text())
     if text1 != text2:
         label_text += "<br>" + BAD % PASSWORD_MATCH
     assistance.setText(label_text)

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-06-08 13:33:39 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-07-30 18:07:25 +0000
@@ -37,6 +37,7 @@
 from ubuntu_sso.qt import LINK_STYLE, build_general_error_message
 from ubuntu_sso.qt.sso_wizard_page import SSOWizardPage
 from ubuntu_sso.qt.ui.current_user_sign_in_ui import Ui_CurrentUserSignInPage
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
     EMAIL_LABEL,
@@ -56,9 +57,9 @@
     """Wizard Page that lets a current user Sign into Ubuntu Single Sign On."""
 
     ui_class = Ui_CurrentUserSignInPage
-    userLoggedIn = QtCore.pyqtSignal(unicode)
+    userLoggedIn = QtCore.pyqtSignal(compat.text_type)
     passwordForgotten = QtCore.pyqtSignal()
-    userNotValidated = QtCore.pyqtSignal(unicode)
+    userNotValidated = QtCore.pyqtSignal(compat.text_type)
 
     @property
     def _signals(self):
@@ -76,12 +77,12 @@
     @property
     def password(self):
         """Return the content of the password edit."""
-        return unicode(self.ui.password_edit.text())
+        return compat.text_type(self.ui.password_edit.text())
 
     def on_user_not_validated(self, app_name, email):
         """Show the validate email page."""
         self.hide_overlay()
-        email = unicode(self.ui.email_edit.text())
+        email = compat.text_type(self.ui.email_edit.text())
         self.userNotValidated.emit(email)
 
     # Invalid names of Qt-inherited methods
@@ -129,17 +130,19 @@
 
     def _validate(self):
         """Perform input validation."""
-        correct_mail = is_correct_email(unicode(self.ui.email_edit.text()))
-        correct_password = len(unicode(self.ui.password_edit.text())) > 0
+        correct_mail = is_correct_email(
+                        compat.text_type(self.ui.email_edit.text()))
+        correct_password = len(
+                        compat.text_type(self.ui.password_edit.text())) > 0
         enabled = correct_mail and correct_password
         self.ui.sign_in_button.setEnabled(enabled)
 
     def login(self):
         """Perform the login using the self.backend."""
         # grab the data from the view and call the backend
-        email = unicode(self.ui.email_edit.text())
+        email = compat.text_type(self.ui.email_edit.text())
         logger.info('CurrentUserSignInPage.login for: %s', email)
-        password = unicode(self.ui.password_edit.text())
+        password = compat.text_type(self.ui.password_edit.text())
         args = (self.app_name, email, password)
         if self.ping_url:
             f = self.backend.login_and_ping
@@ -163,7 +166,7 @@
         """We managed to log in."""
         logger.info('Logged in for %s', app_name)
         self.hide_overlay()
-        email = unicode(self.ui.email_edit.text())
+        email = compat.text_type(self.ui.email_edit.text())
         logger.debug('About to emit userLoggedIn signal with: (%s).', email)
         self.userLoggedIn.emit(email)
 

=== modified file 'ubuntu_sso/qt/email_verification_page.py'
--- ubuntu_sso/qt/email_verification_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/email_verification_page.py	2012-07-30 18:07:25 +0000
@@ -37,6 +37,7 @@
 from ubuntu_sso.qt import build_general_error_message
 from ubuntu_sso.qt.sso_wizard_page import SSOWizardPage
 from ubuntu_sso.qt.ui.email_verification_ui import Ui_EmailVerificationPage
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     ERROR_EMAIL_TOKEN,
     NEXT,
@@ -53,7 +54,7 @@
     """Widget used to input the email verification code."""
 
     ui_class = Ui_EmailVerificationPage
-    registrationSuccess = QtCore.pyqtSignal(unicode)
+    registrationSuccess = QtCore.pyqtSignal(compat.text_type)
 
     def __init__(self, *args, **kwargs):
         self.email = ''
@@ -115,7 +116,7 @@
         """Call the next action."""
         logger.debug('EmailVerificationController.validate_email for: %s',
             self.email)
-        code = unicode(self.ui.verification_code_edit.text())
+        code = compat.text_type(self.ui.verification_code_edit.text())
         args = (self.app_name, self.email, self.password, code)
         self.hide_error()
         self.show_overlay()

=== modified file 'ubuntu_sso/qt/forgotten_password_page.py'
--- ubuntu_sso/qt/forgotten_password_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/forgotten_password_page.py	2012-07-30 18:07:25 +0000
@@ -36,6 +36,7 @@
 from ubuntu_sso.logger import setup_gui_logging, log_call
 from ubuntu_sso.qt.sso_wizard_page import SSOWizardEnhancedEditPage
 from ubuntu_sso.qt.ui.forgotten_password_ui import Ui_ForgottenPasswordPage
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     EMAIL_LABEL,
     FORGOTTEN_PASSWORD_TITLE,
@@ -53,7 +54,7 @@
     """Widget used to deal with users that forgot the password."""
 
     ui_class = Ui_ForgottenPasswordPage
-    passwordResetTokenSent = QtCore.pyqtSignal(unicode)
+    passwordResetTokenSent = QtCore.pyqtSignal(compat.text_type)
 
     @property
     def _signals(self):
@@ -69,7 +70,7 @@
     @property
     def email_address(self):
         """Return the email address provided by the user."""
-        return unicode(self.ui.email_line_edit.text())
+        return compat.text_type(self.ui.email_line_edit.text())
 
     #pylint: disable=C0103
 
@@ -122,7 +123,7 @@
 
     def _validate(self):
         """Validate that we have an email."""
-        email = unicode(self.ui.email_line_edit.text())
+        email = compat.text_type(self.ui.email_line_edit.text())
         self.ui.send_button.setEnabled(is_correct_email(email))
 
     def on_password_reset_token_sent(self, app_name, email):

=== modified file 'ubuntu_sso/qt/loadingoverlay.py'
--- ubuntu_sso/qt/loadingoverlay.py	2012-06-22 22:34:43 +0000
+++ ubuntu_sso/qt/loadingoverlay.py	2012-07-30 18:07:25 +0000
@@ -28,12 +28,14 @@
 # files in the program, then also delete it here.
 """Loading animation over a widget."""
 
+from __future__ import unicode_literals
+
 from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso.qt.ui import loadingoverlay_ui
 from ubuntu_sso.utils.ui import LOADING_OVERLAY
 
-LOADING_STYLE = u'<span style="font-size:x-large;">{0}</span>'
+LOADING_STYLE = '<span style="font-size:x-large;">{0}</span>'
 
 
 class LoadingOverlay(QtGui.QFrame):

=== modified file 'ubuntu_sso/qt/main/__init__.py'
--- ubuntu_sso/qt/main/__init__.py	2012-06-13 21:26:02 +0000
+++ ubuntu_sso/qt/main/__init__.py	2012-07-30 18:07:25 +0000
@@ -38,7 +38,7 @@
 from ubuntu_sso.qt.ui import resources_rc
 # pylint: enable=W0611
 from ubuntu_sso.qt.ubuntu_sso_wizard import UbuntuSSOClientGUI
-from ubuntu_sso.utils import PLATFORM_QSS
+from ubuntu_sso.utils import compat, PLATFORM_QSS
 
 
 # Invalid name "source", pylint: disable=C0103
@@ -63,13 +63,13 @@
     data = []
     for qss_name in (PLATFORM_QSS, ":/stylesheet.qss"):
         qss = QtCore.QResource(qss_name)
-        data.append(unicode(qss.data()))
+        data.append(compat.text_type(qss.data()))
     app.setStyleSheet('\n'.join(data))
 
     # Fix the string that contains unicode chars.
     for key in kwargs:
         value = kwargs[key]
-        if isinstance(value, str):
+        if isinstance(value, compat.binary_type):
             kwargs[key] = value.decode('utf-8')
 
     # Unused variable 'ui', pylint: disable=W0612

=== modified file 'ubuntu_sso/qt/main/tests/test_main.py'
--- ubuntu_sso/qt/main/tests/test_main.py	2012-06-13 21:52:42 +0000
+++ ubuntu_sso/qt/main/tests/test_main.py	2012-07-30 18:07:25 +0000
@@ -37,6 +37,7 @@
 from twisted.trial.unittest import TestCase
 
 from ubuntu_sso.qt import main
+from ubuntu_sso.utils import compat
 from ubuntu_sso import tests
 
 
@@ -205,7 +206,7 @@
         data = []
         for qss_name in (main.PLATFORM_QSS, ":/stylesheet.qss"):
             qss = QtCore.QResource(qss_name)
-            data.append(unicode(qss.data()))
+            data.append(compat.text_type(qss.data()))
         self.assertEqual(
-        unicode(main.QtGui.QApplication.instance().styleSheet()),
+        compat.text_type(main.QtGui.QApplication.instance().styleSheet()),
             '\n'.join(data))

=== modified file 'ubuntu_sso/qt/proxy_dialog.py'
--- ubuntu_sso/qt/proxy_dialog.py	2012-06-22 16:12:03 +0000
+++ ubuntu_sso/qt/proxy_dialog.py	2012-07-30 18:07:25 +0000
@@ -38,6 +38,7 @@
 from ubuntu_sso.logger import setup_gui_logging
 from ubuntu_sso.keyring import Keyring
 from ubuntu_sso.qt.ui.proxy_credentials_dialog_ui import Ui_ProxyCredsDialog
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
     PROXY_CREDS_DIALOG_TITLE,
@@ -109,8 +110,10 @@
     @defer.inlineCallbacks
     def _on_save_clicked(self, *args):
         """Save the new credentials."""
-        username = unicode(self.ui.username_entry.text()).encode('utf8')
-        password = unicode(self.ui.password_entry.text()).encode('utf8')
+        username = compat.text_type(
+                        self.ui.username_entry.text()).encode('utf8')
+        password = compat.text_type(
+                        self.ui.password_entry.text()).encode('utf8')
         creds = dict(username=username, password=password)
         # pylint: disable=W0703, W0612
         try:

=== modified file 'ubuntu_sso/qt/reset_password_page.py'
--- ubuntu_sso/qt/reset_password_page.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/reset_password_page.py	2012-07-30 18:07:25 +0000
@@ -38,6 +38,7 @@
 from ubuntu_sso.qt import build_general_error_message, common
 from ubuntu_sso.qt.sso_wizard_page import SSOWizardEnhancedEditPage
 from ubuntu_sso.qt.ui.reset_password_ui import Ui_ResetPasswordPage
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     is_min_required_password,
     PASSWORD1_ENTRY,
@@ -57,7 +58,7 @@
     """Widget used to allow the user change his password."""
 
     ui_class = Ui_ResetPasswordPage
-    passwordChanged = pyqtSignal(unicode)
+    passwordChanged = pyqtSignal(compat.text_type)
 
     @property
     def _signals(self):
@@ -146,9 +147,9 @@
     def _validate(self):
         """Enable the submit button if data is valid."""
         enabled = True
-        code = unicode(self.ui.reset_code_line_edit.text())
-        password = unicode(self.ui.password_line_edit.text())
-        confirm_password = unicode(
+        code = compat.text_type(self.ui.reset_code_line_edit.text())
+        password = compat.text_type(self.ui.password_line_edit.text())
+        confirm_password = compat.text_type(
             self.ui.confirm_password_line_edit.text())
         if not is_min_required_password(password):
             enabled = False
@@ -175,7 +176,8 @@
         logger.info('ResetPasswordPage.on_password_changed for %s, email: %s',
             app_name, email)
         self.hide_overlay()
-        email = unicode(self.wizard().forgotten.ui.email_line_edit.text())
+        email = compat.text_type(
+                    self.wizard().forgotten.ui.email_line_edit.text())
         self.passwordChanged.emit(email)
 
     def on_password_change_error(self, app_name, error):
@@ -187,9 +189,10 @@
     def set_new_password(self):
         """Request a new password to be set."""
         self.hide_error()
-        email = unicode(self.wizard().forgotten.ui.email_line_edit.text())
-        code = unicode(self.ui.reset_code_line_edit.text())
-        password = unicode(self.ui.password_line_edit.text())
+        email = compat.text_type(
+                    self.wizard().forgotten.ui.email_line_edit.text())
+        code = compat.text_type(self.ui.reset_code_line_edit.text())
+        password = compat.text_type(self.ui.password_line_edit.text())
         logger.info('Setting new password for %r and email %r with code %r',
                     self.app_name, email, code)
         args = (self.app_name, email, code, password)
@@ -201,4 +204,4 @@
 
     def is_correct_password_confirmation(self, password):
         """Return if the password is correct."""
-        return unicode(self.ui.password_line_edit.text()) == password
+        return compat.text_type(self.ui.password_line_edit.text()) == password

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-07-03 21:30:33 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-07-30 18:07:25 +0000
@@ -53,6 +53,7 @@
 )
 from ubuntu_sso.qt.sso_wizard_page import SSOWizardEnhancedEditPage
 from ubuntu_sso.qt.ui.setup_account_ui import Ui_SetUpAccountPage
+from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     AGREE_TO_PRIVACY_POLICY,
     AGREE_TO_TERMS,
@@ -99,7 +100,7 @@
     """Customized Setup Account page for SSO."""
 
     ui_class = Ui_SetUpAccountPage
-    userRegistered = QtCore.pyqtSignal(unicode)
+    userRegistered = QtCore.pyqtSignal(compat.text_type)
 
     def __init__(self, *args, **kwargs):
         self.captcha_file = None
@@ -127,7 +128,7 @@
     @property
     def password(self):
         """Return the content of the password edit."""
-        return unicode(self.ui.password_edit.text())
+        return compat.text_type(self.ui.password_edit.text())
 
     # Invalid name "initializePage"
     # pylint: disable=C0103
@@ -263,12 +264,14 @@
 
     def _enable_setup_button(self):
         """Only enable the setup button if the form is valid."""
-        name = unicode(self.ui.name_edit.text()).strip()
-        email = unicode(self.ui.email_edit.text())
-        confirm_email = unicode(self.ui.confirm_email_edit.text())
-        password = unicode(self.ui.password_edit.text())
-        confirm_password = unicode(self.ui.confirm_password_edit.text())
-        captcha_solution = unicode(self.ui.captcha_solution_edit.text())
+        name = compat.text_type(self.ui.name_edit.text()).strip()
+        email = compat.text_type(self.ui.email_edit.text())
+        confirm_email = compat.text_type(self.ui.confirm_email_edit.text())
+        password = compat.text_type(self.ui.password_edit.text())
+        confirm_password = compat.text_type(
+                self.ui.confirm_password_edit.text())
+        captcha_solution = compat.text_type(
+                self.ui.captcha_solution_edit.text())
 
         # Check for len(name) > 0 to ensure that a bool is assigned to enabled
         if not self.terms_checkbox.isVisible():
@@ -355,18 +358,20 @@
     def on_user_registered(self, app_name, email):
         """Execute when the user did register."""
         self.hide_overlay()
-        email = unicode(self.ui.email_edit.text())
+        email = compat.text_type(self.ui.email_edit.text())
         self.userRegistered.emit(email)
 
     def validate_form(self):
         """Validate the info of the form and return an error."""
         logger.debug('SetUpAccountPage.validate_form')
-        name = unicode(self.ui.name_edit.text()).strip()
-        email = unicode(self.ui.email_edit.text())
-        confirm_email = unicode(self.ui.confirm_email_edit.text())
-        password = unicode(self.ui.password_edit.text())
-        confirm_password = unicode(self.ui.confirm_password_edit.text())
-        captcha_solution = unicode(self.ui.captcha_solution_edit.text())
+        name = compat.text_type(self.ui.name_edit.text()).strip()
+        email = compat.text_type(self.ui.email_edit.text())
+        confirm_email = compat.text_type(self.ui.confirm_email_edit.text())
+        password = compat.text_type(self.ui.password_edit.text())
+        confirm_password = compat.text_type(
+                self.ui.confirm_password_edit.text())
+        captcha_solution = compat.text_type(
+                self.ui.captcha_solution_edit.text())
         condition = True
         messages = []
         if not name:
@@ -395,11 +400,12 @@
     def set_next_validation(self):
         """Set the validation as the next page."""
         logger.debug('SetUpAccountPage.set_next_validation')
-        email = unicode(self.ui.email_edit.text())
-        password = unicode(self.ui.password_edit.text())
-        name = unicode(self.ui.name_edit.text())
+        email = compat.text_type(self.ui.email_edit.text())
+        password = compat.text_type(self.ui.password_edit.text())
+        name = compat.text_type(self.ui.name_edit.text())
         captcha_id = self.captcha_id
-        captcha_solution = unicode(self.ui.captcha_solution_edit.text())
+        captcha_solution = compat.text_type(
+                self.ui.captcha_solution_edit.text())
         # validate the current info of the form, try to perform the action
         # to register the user, and then move foward
         if self.validate_form():
@@ -418,11 +424,11 @@
 
     def is_correct_email_confirmation(self, email_address):
         """Return that the email is the same."""
-        return unicode(self.ui.email_edit.text()) == email_address
+        return compat.text_type(self.ui.email_edit.text()) == email_address
 
     def is_correct_password_confirmation(self, password):
         """Return that the passwords are correct."""
-        return unicode(self.ui.password_edit.text()) == password
+        return compat.text_type(self.ui.password_edit.text()) == password
 
     def focus_changed(self, old, now):
         """Check who has the focus to activate password popups if necessary."""
@@ -441,7 +447,7 @@
 
     def name_assistance(self):
         """Show help for the name field."""
-        text = unicode(self.ui.name_edit.text())
+        text = compat.text_type(self.ui.name_edit.text())
         if not text.strip():
             self.set_error_message(self.ui.name_assistance,
                 EMPTY_NAME)
@@ -452,7 +458,7 @@
 
     def email_assistance(self):
         """Show help for the email field."""
-        text = unicode(self.ui.email_edit.text())
+        text = compat.text_type(self.ui.email_edit.text())
         if not is_correct_email(text):
             self.set_error_message(self.ui.email_assistance,
                 INVALID_EMAIL)
@@ -463,8 +469,8 @@
 
     def confirm_email_assistance(self):
         """Show help for the confirm email field."""
-        text1 = unicode(self.ui.email_edit.text())
-        text2 = unicode(self.ui.confirm_email_edit.text())
+        text1 = compat.text_type(self.ui.email_edit.text())
+        text2 = compat.text_type(self.ui.confirm_email_edit.text())
         if text1 != text2:
             self.set_error_message(self.ui.confirm_email_assistance,
                 EMAIL_MATCH)

=== modified file 'ubuntu_sso/qt/tests/__init__.py'
--- ubuntu_sso/qt/tests/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/__init__.py	2012-07-30 18:07:25 +0000
@@ -42,6 +42,7 @@
     TC_URL,
     WINDOW_ID,
 )
+from ubuntu_sso.utils import compat
 
 KWARGS = dict(app_name=APP_NAME, help_text=HELP_TEXT, ping_url=PING_URL,
               policy_url=POLICY_URL, tc_url=TC_URL, window_id=WINDOW_ID)
@@ -498,10 +499,10 @@
         label = QtGui.QLabel()
         maybe_elide_text(label, expected, max_width)
 
-        self.assertEqual(TITLE_STYLE % unicode(label.text()),
-                         unicode(title_label.text()))
-        self.assertEqual(unicode(label.toolTip()),
-                         unicode(title_label.toolTip()))
+        self.assertEqual(TITLE_STYLE % compat.text_type(label.text()),
+                         compat.text_type(title_label.text()))
+        self.assertEqual(compat.text_type(label.toolTip()),
+                         compat.text_type(title_label.toolTip()))
         self.assertTrue(title_label.isVisible())
 
     def assert_subtitle_correct(self, subtitle_label, expected, max_width):
@@ -509,9 +510,10 @@
         label = QtGui.QLabel()
         maybe_elide_text(label, expected, max_width)
 
-        self.assertEqual(unicode(label.text()), unicode(subtitle_label.text()))
-        self.assertEqual(unicode(label.toolTip()),
-                         unicode(subtitle_label.toolTip()))
+        self.assertEqual(compat.text_type(label.text()),
+                         compat.text_type(subtitle_label.text()))
+        self.assertEqual(compat.text_type(label.toolTip()),
+                         compat.text_type(subtitle_label.toolTip()))
         self.assertTrue(subtitle_label.isVisible())
 
     def assert_error_correct(self, error_label, expected, max_width):
@@ -519,10 +521,10 @@
         label = QtGui.QLabel()
         maybe_elide_text(label, expected, max_width)
 
-        self.assertEqual(ERROR_STYLE % unicode(label.text()),
-                         unicode(error_label.text()))
-        self.assertEqual(unicode(label.toolTip()),
-                         unicode(error_label.toolTip()))
+        self.assertEqual(ERROR_STYLE % compat.text_type(label.text()),
+                         compat.text_type(error_label.text()))
+        self.assertEqual(compat.text_type(label.toolTip()),
+                         compat.text_type(error_label.toolTip()))
         self.assertTrue(error_label.isVisible())
 
     def get_pixmap_data(self, pixmap):

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-05-25 13:51:31 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-07-30 18:07:25 +0000
@@ -44,6 +44,7 @@
     USER_SUCCESS,
 )
 from ubuntu_sso.logger import setup_gui_logging
+from ubuntu_sso.utils import compat
 from ubuntu_sso.qt import PREFERED_UI_SIZE, WINDOW_TITLE
 from ubuntu_sso.qt.current_user_sign_in_page import CurrentUserSignInPage
 from ubuntu_sso.qt.email_verification_page import EmailVerificationPage
@@ -203,7 +204,7 @@
         logger.debug('Moving to EmailVerificationPage from: %s',
             self.currentPage())
         self._next_id = self.email_verification_page_id
-        self.email_verification.email = unicode(email)
+        self.email_verification.email = compat.text_type(email)
         self.email_verification.password = self.currentPage().password
         self.next()
         self._next_id = -1