Merge lp:~salgado/launchpad/remove-crap into lp:launchpad

[Guilherme Salgado]

Remove some more stuff that's no longer used.

The thing to answer captchas is no longer used as we got rid of the
registration and password reset pages. And the +dims hasn't been used
in a looooong time.

= 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/launchpad/zcml/launchpad.zcml
  lib/canonical/launchpad/browser/launchpad.py

== Pylint notices ==

lib/canonical/launchpad/browser/launchpad.py
    80: [F0401] Unable to import 'lazr.uri' (No module named uri)

[Abel Deuring (adeuring)]

review: Approve (code)

[Guilherme Salgado (salgado)]

Unfortunately, there's a test on c-i-p that depend on get_captcha_answer, so I'll have to wait until we've killed c-i-p to land this

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2010-03-04 20:19:39 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2010-04-05 18:07:31 +0000
@@ -7,7 +7,6 @@
 __all__ = [
     'AppFrontPageSearchView',
     'ApplicationButtons',
-    'BrowserWindowDimensions',
     'DoesNotExistView',
     'Hierarchy',
     'IcingContribFolder',
@@ -998,13 +997,6 @@
         return self.getFieldError('scope')
 
 
-class BrowserWindowDimensions(LaunchpadView):
-    """Allow capture of browser window dimensions."""
-
-    def render(self):
-        return u'Thanks.'
-
-
 class LaunchpadGraphics(LaunchpadView):
     label = page_title = 'Overview of Launchpad graphics and icons'
 

=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
--- lib/canonical/launchpad/zcml/launchpad.zcml	2010-03-26 22:57:38 +0000
+++ lib/canonical/launchpad/zcml/launchpad.zcml	2010-04-05 18:07:31 +0000
@@ -419,14 +419,6 @@
   attribute="__call__"
   />
 
-<browser:page
-  for="canonical.launchpad.interfaces.ILaunchpadRoot"
-  name="+dims"
-  permission="zope.Public"
-  class="canonical.launchpad.browser.BrowserWindowDimensions"
-  attribute="__call__"
-  />
-
 <class class="canonical.launchpad.webapp.publisher.RenamedView">
   <allow interface="zope.publisher.interfaces.browser.IBrowserPublisher"
           attributes="__call__"

=== removed file 'lib/lp/testing/registration.py'
--- lib/lp/testing/registration.py	2009-10-16 19:56:29 +0000
+++ lib/lp/testing/registration.py	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Helper functions dealing with registration in tests.
-"""
-__metaclass__ = type
-
-__all__ = [
-    'get_captcha_answer',
-    'set_captcha_answer',
-    ]
-
-import re
-
-
-def get_captcha_answer(contents):
-    """Search the browser contents and get the captcha answer."""
-    expr = re.compile("(\d+ .{1} \d+) =")
-    match = expr.search(contents)
-    if match:
-        question = match.group(1)
-        answer = eval(question)
-        return str(answer)
-    return ''
-
-
-def set_captcha_answer(browser, answer=None, prefix=''):
-    """Given a browser, set the login captcha with the correct answer."""
-    if answer is None:
-        answer = get_captcha_answer(browser.contents)
-    browser.getControl(name=prefix + 'captcha_submission').value = (
-        answer)