launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-openid-callback-view into launchpad:master.

Commit message:
Fix OpenIDCallbackView.processPositiveAssertion for Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/398977

On Python 3, the identity URL is already text.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-openid-callback-view into launchpad:master.

diff --git a/lib/lp/services/webapp/login.py b/lib/lp/services/webapp/login.py
index 5367047..f386b75 100644
--- a/lib/lp/services/webapp/login.py
+++ b/lib/lp/services/webapp/login.py
@@ -363,7 +363,7 @@ class OpenIDCallbackView(OpenIDLogin):
         the changes we just did.
         """
         identifier = self.openid_response.identity_url.split('/')[-1]
-        identifier = identifier.decode('ascii')
+        identifier = six.ensure_text(identifier, encoding='ascii')
         should_update_last_write = False
         # Force the use of the master database to make sure a lagged slave
         # doesn't fool us into creating a Person/Account when one already