Merge lp:~salgado/launchpad/bug-532669 into lp:launchpad

[Guilherme Salgado]

Remove the password field from +deactivate-account as soon enough we
won't even have access to the account's password, not to mention that it
wouldn't make any sense as the account password is the OpenID provider's
business and we're just a consumer.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/templates/person-deactivate-account.pt
  lib/lp/registry/stories/person/xx-deactivate-account.txt
  lib/lp/registry/browser/person.py

== Pylint notices ==

lib/lp/registry/browser/person.py
    117: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    118: [F0401] Unable to import 'lazr.config' (No module named config)
    119: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    120: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)
    230: [F0401] Unable to import 'lazr.uri' (No module named uri)

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-03-13 00:32:40 +0000
+++ lib/lp/registry/browser/person.py	2010-03-16 13:03:31 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# pylint: disable-msg=E0211,E0213
+# pylint: disable-msg=E0211,E0213,C0322
 
 """Person-related view classes."""
 
@@ -116,7 +116,7 @@
 from canonical.config import config
 from lazr.delegates import delegates
 from lazr.config import as_timedelta
-from lazr.restful.interface import copy_field, use_template
+from lazr.restful.interface import copy_field
 from lazr.restful.interfaces import IWebServiceClientRequest
 from canonical.lazr.utils import safe_hasattr
 from canonical.database.sqlbase import flush_database_updates
@@ -221,7 +221,6 @@
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
-from canonical.launchpad.webapp.interfaces import IPlacelessLoginSource
 from canonical.launchpad.webapp.login import (
     logoutPerson, allowUnauthenticatedSession)
 from canonical.launchpad.webapp.menu import get_current_view
@@ -1404,7 +1403,6 @@
 
 
 class DeactivateAccountSchema(Interface):
-    use_template(IPerson, include=['password'])
     comment = copy_field(
         IPerson['account_status_comment'], readonly=False, __name__='comment')
 
@@ -1415,19 +1413,6 @@
     label = "Deactivate your Launchpad account"
     custom_widget('comment', TextAreaWidget, height=5, width=60)
 
-    def validate(self, data):
-        loginsource = getUtility(IPlacelessLoginSource)
-        principal = loginsource.getPrincipalByLogin(
-            self.user.preferredemail.email)
-        assert principal is not None, "User must be logged in at this point."
-        # The widget will transform '' into a special marker value.
-        password = data.get('password')
-        if password is self.schema['password'].UNCHANGED_PASSWORD:
-            password = u''
-        if not principal.validate(password):
-            self.setFieldError('password', 'Incorrect password.')
-            return
-
     @action(_("Deactivate My Account"), name="deactivate")
     def deactivate_action(self, action, data):
         self.context.deactivateAccount(data['comment'])

=== modified file 'lib/lp/registry/stories/person/xx-deactivate-account.txt'
--- lib/lp/registry/stories/person/xx-deactivate-account.txt	2010-02-05 13:25:46 +0000
+++ lib/lp/registry/stories/person/xx-deactivate-account.txt	2010-03-16 13:03:31 +0000
@@ -1,7 +1,7 @@
 = Deactivating user accounts =
 
 Users who don't want to use Launchpad anymore can easily deactivate their
-accounts, so they stop receiving emails from Launchpad and make it impossible
+accounts so they stop receiving emails from Launchpad and make it impossible
 to use their accounts to log in.
 
 Deactivating a user's account will un-assign all their bug tasks. To
@@ -35,25 +35,6 @@
     >>> browser.url
     'http://launchpad.dev/~name12/+deactivate-account'
 
-To deactivate a user's account we require the user to enter his password.
-
-    >>> browser.getControl('Why are you deactivating your account?').value = (
-    ...     "I'm going to become a Budhist monk in Tibet")
-    >>> browser.getControl('Deactivate My Account').click()
-    >>> for msg in get_feedback_messages(browser.contents):
-    ...     print msg
-    There is 1 error.
-    Incorrect password.
-
-    >>> browser.getControl('Password').value = 't'
-    >>> browser.url
-    'http://launchpad.dev/%7Ename12/+deactivate-account'
-    >>> for msg in get_feedback_messages(browser.contents):
-    ...     print msg
-    There is 1 error.
-    Incorrect password.
-
-    >>> browser.getControl('Password').value = 'test'
     >>> browser.getControl('Deactivate My Account').click()
     >>> browser.url
     'http://launchpad.dev'

=== modified file 'lib/lp/registry/templates/person-deactivate-account.pt'
--- lib/lp/registry/templates/person-deactivate-account.pt	2009-09-15 17:30:28 +0000
+++ lib/lp/registry/templates/person-deactivate-account.pt	2010-03-16 13:03:31 +0000
@@ -9,11 +9,6 @@
 
   <div metal:fill-slot="main">
     <div metal:use-macro="context/@@launchpad_form/form">
-      <p metal:fill-slot="extra_top">
-        For verification purposes we ask that you enter your Launchpad
-        password. If you've forgotten it you'll have to
-        <a href="/+forgottenpassword">reset it</a> first.
-      </p>
 
       <div metal:fill-slot="extra_bottom">
         <p>