Merge lp:~wallyworld/launchpad/oops-bug-filing-location into lp:launchpad

[Ian Booth]

[r=stevenk][ui=none][bug=691343] Change some project based bugs urls to just launchpad ones

= Summary =

Trivial fix to remove references such as http://bug.launchpad.net/launchpad-code and replace with http://bug.launchpad.net/launchpad

= Implementation =

Change some urls.

= Tests =

None

= Lint =

(all existing issues)

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/launchpad_loggerhead/app.py
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/lp/registry/model/person.py

./lib/launchpad_loggerhead/app.py
      99: E231 missing whitespace after ':'
     237: E301 expected 1 blank line, found 0
     336: E301 expected 1 blank line, found 0
     227: Line exceeds 78 characters.
     250: Line exceeds 78 characters.
     288: Line exceeds 78 characters.
     332: Line exceeds 78 characters.
     333: Line exceeds 78 characters.
     354: Line exceeds 78 characters.

[Steve Kowalik (stevenk)]

Do it, except the URLs currently redirect anyway.

review: Approve (code*)

=== modified file 'lib/launchpad_loggerhead/app.py'
--- lib/launchpad_loggerhead/app.py	2010-08-03 00:22:37 +0000
+++ lib/launchpad_loggerhead/app.py	2010-12-17 04:53:55 +0000
@@ -257,8 +257,8 @@
 <h1>Oops!</h1>
 <p>Something broke while generating the page.
 Please try again in a few minutes, and if the problem persists file a bug at
-<a href="https://bugs.launchpad.net/launchpad-code"
->https://bugs.launchpad.net/launchpad-code</a>
+<a href="https://bugs.launchpad.net/launchpad"
+>https://bugs.launchpad.net/launchpad</a>
 and quote OOPS-ID <strong>%(oopsid)s</strong>
 </p></body></html>'''
 
@@ -271,7 +271,7 @@
     """Wraps start_response (from a WSGI request) to keep track of whether
     start_response was called (and whether the callable it returns has been
     called).
-    
+
     Used by oops_middleware.
     """
 
@@ -324,7 +324,7 @@
         [], URL=construct_url(environ))
     error_utility.raising(sys.exc_info(), request)
     return request.oopsid
-        
+
 
 def oops_middleware(app):
     """Middleware to log an OOPS if the request fails.

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-12-13 08:23:15 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-12-17 04:53:55 +0000
@@ -95,7 +95,7 @@
     'We\'re still working on source package recipes. '
     'We would love for you to try them out, and if you have '
     'any issues, please '
-    '<a href="http://bugs.launchpad.net/launchpad-code">'
+    '<a href="http://bugs.launchpad.net/launchpad">'
     'file a bug</a>.  We\'ll be happy to fix any problems you encounter.')
 
 

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-12-16 19:27:54 +0000
+++ lib/lp/registry/model/person.py	2010-12-17 04:53:55 +0000
@@ -307,7 +307,7 @@
     Note that it performs poorly at least some of the time, and if
     EmailAddress and Person are already being queried, its probably better to
     query Account directly. See bug
-    https://bugs.launchpad.net/launchpad-registry/+bug/615237 for some
+    https://bugs.launchpad.net/launchpad/+bug/615237 for some
     corroborating information.
     """