Launchpad itself

Merge ~cjwatson/launchpad:py3-openid-callback-view into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-openid-callback-view
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 830f8d1699e1a81f1824321673bb8c7c13c0b67d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-openid-callback-view
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
lib/lp/services/webapp/login.py (+1/-1)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+398977@code.launchpad.net

Commit message

Fix OpenIDCallbackView.processPositiveAssertion for Python 3

Description of the change

On Python 3, the identity URL is already text.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/services/webapp/login.py b/lib/lp/services/webapp/login.py
2index 5367047..f386b75 100644
3--- a/lib/lp/services/webapp/login.py
4+++ b/lib/lp/services/webapp/login.py
5@@ -363,7 +363,7 @@ class OpenIDCallbackView(OpenIDLogin):
6 the changes we just did.
7 """
8 identifier = self.openid_response.identity_url.split('/')[-1]
9- identifier = identifier.decode('ascii')
10+ identifier = six.ensure_text(identifier, encoding='ascii')
11 should_update_last_write = False
12 # Force the use of the master database to make sure a lagged slave
13 # doesn't fool us into creating a Person/Account when one already

Subscribers

People subscribed via source and target branches

to status/vote changes: