Merge lp:~salgado/launchpad/bug-556594 into lp:launchpad
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~salgado/launchpad/bug-556594 |
Merge into: | lp:launchpad |
Diff against target: |
228 lines (+94/-35) 5 files modified
lib/canonical/launchpad/database/account.py (+0/-4) lib/canonical/launchpad/webapp/login.py (+41/-11) lib/canonical/launchpad/webapp/tests/test_login.py (+44/-2) lib/lp/registry/doc/person-account.txt (+5/-16) lib/lp/testing/factory.py (+4/-2) |
To merge this branch: | bzr merge lp:~salgado/launchpad/bug-556594 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis J. Lacoste (community) | release-critical | Approve | |
Brad Crittenden (community) | code | Approve | |
Review via email: mp+22906@code.launchpad.net |
Description of the change
Fix account-
While fixing bug 556594 I realized we weren't actually reactivating
accounts on login, so I had to fix this first.
As part of this I had to fix the makeAccount() factory method to not
create deactivated accounts with preferred email addresses (as that's
not a valid state for them to be in), and also changed
IAccount.
that doesn't matter anymore (the password is no longer used for anything
in LP, but it'll be around until we find the time to get rid of the
Account and AccountPassword tables).
= Launchpad lint =
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
Linting changed files:
lib/canonical
lib/canonical
lib/lp/
lib/canonical
== Pylint notices ==
lib/canonical/
9: [F0401] Unable to import 'zope.component'
10: [F0401] Unable to import 'zope.security.
11: [F0401] Unable to import 'zope.interface'
lib/canonical/
5: [W0105] String statement has no effect
21: [F0401] Unable to import 'zope.app.
22: [F0401] Unable to import 'zope.component'
23: [F0401] Unable to import 'zope.event'
24: [F0401] Unable to import 'zope.interface'
25: [F0401] Unable to import 'zope.publisher
26: [F0401] Unable to import 'zope.publisher
27: [F0401] Unable to import 'zope.security.
28: [F0401] Unable to import 'zope.session.
lib/lp/
33: [F0401] Unable to import 'zope.component'
34: [F0401] Unable to import 'zope.security.
1753: [F0401, LaunchpadObject
lib/canonical/
21: [F0401] Unable to import 'zope.component'
22: [F0401] Unable to import 'zope.security.
23: [F0401] Unable to import 'zope.security.
24: [F0401] Unable to import 'zope.session.
Hi Salgado,
This branch looks good. I'd change one thing: /'Reactivated by the user'/
s/'Reactivated by the user herself'
It conveys the full message without getting into the need for a gender-specific pronoun.