Ubuntu Single Sign On Client

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

  1. py3-unicode-part-3
  2. Merge into trunk
Proposed by Brian Curtin
Status: Superseded
Proposed branch: lp://staging/~brian.curtin/ubuntu-sso-client/py3-unicode-part-3
Merge into: lp://staging/ubuntu-sso-client
Prerequisite: lp://staging/~brian.curtin/ubuntu-sso-client/py3-unicode-part-2
Diff against target: 854 lines (+149/-112)
17 files modified
ubuntu_sso/qt/tests/show_gui.py (+7/-5)
ubuntu_sso/qt/tests/test_common.py (+28/-25)
ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+15/-9)
ubuntu_sso/qt/tests/test_forgotten_password.py (+8/-5)
ubuntu_sso/qt/tests/test_reset_password.py (+6/-4)
ubuntu_sso/qt/tests/test_setup_account.py (+14/-11)
ubuntu_sso/qt/tests/test_ssl_dialog.py (+10/-8)
ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py (+2/-1)
ubuntu_sso/tests/__init__.py (+19/-17)
ubuntu_sso/tests/test_account.py (+3/-2)
ubuntu_sso/utils/__init__.py (+6/-4)
ubuntu_sso/utils/runner/glib.py (+4/-3)
ubuntu_sso/utils/runner/tests/test_qt.py (+2/-2)
ubuntu_sso/utils/runner/tests/test_runner.py (+5/-3)
ubuntu_sso/utils/runner/tx.py (+4/-3)
ubuntu_sso/utils/tests/test_common.py (+11/-9)
ubuntu_sso/utils/ui.py (+5/-1)
To merge this branch: bzr merge lp://staging/~brian.curtin/ubuntu-sso-client/py3-unicode-part-3
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Needs Fixing
Review via email: mp+117332@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2012-08-14.

Commit message

The third change to prepare for Python 3 Unicode usage.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) wrote :

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.

Revision history for this message
Alejandro J. Cura (alecu) wrote :

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
lp://staging/~brian.curtin/ubuntu-sso-client/py3-unicode-part-3 updated
990. By Brian Curtin

- Unpack tuple function arguments in a Python 2 and 3 friendly way.

991. By Brian Curtin

- Remove SyncTimestampChecker as it is no longer used.

992. By Brian Curtin

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

993. By Brian Curtin

Fix merge mishaps, yet again

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches