Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/flakes into lp:canonical-identity-provider/release

  1. flakes
  2. Merge into trunk
Proposed by David Owen
Status: Merged
Approved by: David Owen
Approved revision: no longer in the source branch.
Merged at revision: 253
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/flakes
Merge into: lp:canonical-identity-provider/release
Diff against target: 21 lines (+2/-2)
1 file modified
identityprovider/models/account.py (+2/-2)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/flakes
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+86476@code.launchpad.net

Commit message

Reintroduced locally-scoped import to fix test

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'identityprovider/models/account.py'
--- identityprovider/models/account.py 2011-12-20 21:33:34 +0000
+++ identityprovider/models/account.py 2011-12-20 22:51:50 +0000
@@ -12,8 +12,6 @@
1212
13from identityprovider.models.const import (AccountCreationRationale,13from identityprovider.models.const import (AccountCreationRationale,
14 AccountStatus, EmailStatus)14 AccountStatus, EmailStatus)
15
16
17from identityprovider.utils import (15from identityprovider.utils import (
18 encrypt_launchpad_password,16 encrypt_launchpad_password,
19 generate_openid_identifier,17 generate_openid_identifier,
@@ -131,6 +129,8 @@
131 return sites.order_by('-date_last_used')129 return sites.order_by('-date_last_used')
132130
133 def _get_preferredemail(self):131 def _get_preferredemail(self):
132 # import here to avoid circular dependancy issue
133 from identityprovider.models.emailaddress import EmailAddress
134 if not hasattr(self, '_preferredemail'):134 if not hasattr(self, '_preferredemail'):
135 try:135 try:
136 email = None136 email = None