Ubuntu Single Sign On Client

ubuntu_sso/qt/__init__.py (+5/-3)
ubuntu_sso/qt/common.py (+10/-7)
ubuntu_sso/qt/current_user_sign_in_page.py (+12/-9)
ubuntu_sso/qt/email_verification_page.py (+3/-2)
ubuntu_sso/qt/forgotten_password_page.py (+4/-3)
ubuntu_sso/qt/loadingoverlay.py (+3/-1)
ubuntu_sso/qt/main/__init__.py (+3/-3)
ubuntu_sso/qt/main/tests/test_main.py (+3/-2)
ubuntu_sso/qt/proxy_dialog.py (+5/-2)
ubuntu_sso/qt/reset_password_page.py (+12/-9)
ubuntu_sso/qt/setup_account_page.py (+31/-25)
ubuntu_sso/qt/tests/__init__.py (+13/-11)
ubuntu_sso/qt/ubuntu_sso_wizard.py (+2/-1)

To merge this branch:

bzr merge lp://staging/~brian.curtin/ubuntu-sso-client/py3-unicode-part-2

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Mike McCracken (community)		Approve on 2012-07-31
Alejandro J. Cura (community)	2012-07-25	Approve on 2012-07-30
Review via email: mp+116764@code.staging.launchpad.net

Commit message

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

Description of the change

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

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2012-07-30:

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

Revision history for this message

Mike McCracken (mikemc) wrote on 2012-07-31:

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'