Merge lp:~sinzui/launchpad/bad-malone-0 into lp:launchpad

[Curtis Hovey]

Fix a broken link to report a bug, and remove all URLs to /malone.

    Launchpad bug:
        https://bugs.launchpad.net/bugs/709791
    Pre-implementation: no one
    Test command: ./bin/test -vv \
      -t doc/textformatting.txt -t xx-view-editable-bug-task.txt
      -t xx-distribution-upstream-bug-report.txt

--------------------------------------------------------------------

RULES

    * Change the bad link to:
      https://bugs.launchpad.net/launchpad/+filebug
    * Remove all occurrences of /malone from the code.

QA

    * Visit https://bugs.qastaging.launchpad.net/bugs/709277/+watch/85147/+error-help
    * Verify the link to report a bug goes to Lp.

LINT

    lib/canonical/launchpad/doc/textformatting.txt
    lib/lp/bugs/browser/structuralsubscription.py
    lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt
    lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt
    lib/lp/bugs/templates/bugwatch-error-help.pt

IMPLEMENTATION

Fixed the bad link:
    lib/lp/bugs/templates/bugwatch-error-help.pt

Removed everything that looked link a link to /malone. Lint really hated
textformatting.txt:
    lib/canonical/launchpad/doc/textformatting.txt
    lib/lp/bugs/browser/structuralsubscription.py
    lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt
    lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt

[Abel Deuring (adeuring)]

Thanks for all the additional cleanup!

review: Approve (code)

[Abel Deuring (adeuring)]

nice work!

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/textformatting.txt'
--- lib/canonical/launchpad/doc/textformatting.txt	2009-11-05 19:59:52 +0000
+++ lib/canonical/launchpad/doc/textformatting.txt	2011-02-11 14:59:34 +0000
@@ -22,10 +22,12 @@
 So, with textwrap:
 
     >>> import textwrap
-    >>> description = """\
-    ... A new description that is quite long. But the nice thing is that the edit notification email generator knows how to indent and wrap descriptions, so this will appear quite nice in the actual email that gets sent.
-    ...
-    ... It's also smart enough to preserve whitespace, finally!"""
+    >>> description = (
+    ...     "A new description that is quite long. But the nice thing is "
+    ...     "that the edit notification email generator knows how to indent "
+    ...     "and wrap descriptions, so this will appear quite nice in the "
+    ...     "actual email that gets sent.\n\n"
+    ...     "It's also smart enough to preserve whitespace, finally!""")
     >>> wrapped_description = textwrap.fill(description, width=56)
     >>> print wrapped_description  #doctest: -NORMALIZE_WHITESPACE
     A new description that is quite long. But the nice thing
@@ -57,9 +59,11 @@
 
 Let's just make sure that it handles a single paragraph as well.
 
-    >>> single_paragraph = """\
-    ... A new description that is quite long. But the nice thing is that the edit notification email generator knows how to indent and wrap descriptions, so this will appear quite nice in the actual email that gets sent.
-    ... """
+    >>> single_paragraph = (
+    ...     "A new description that is quite long. But the nice thing is "
+    ...     "that the edit notification email generator knows how to indent "
+    ...     "and wrap descriptions, so this will appear quite nice in the "
+    ...     "actual email that gets sent.")
     >>> wrapped_text = mailwrapper.format(single_paragraph)
     >>> print wrapped_text #doctest: -NORMALIZE_WHITESPACE
     A new description that is quite long. But the nice thing
@@ -120,13 +124,15 @@
 Let's see how it behaves when it contains words that can't fit on a
 single line, such as URLs.
 
-    >>> long_word = """\
-    ... This paragraph includes a long URL, https://launchpad.net/products/malone/+bug/1733/+viewstatus. Even though it's longer than 56 characters, it stays on a single line.
-    ... """
+    >>> long_word = (
+    ...     "This paragraph includes a long URL, "
+    ...     "https://launchpad.net/greenishballoon/+bug/1733/+viewstatus. "
+    ...     "Even though it's longer than 56 characters, it stays on a "
+    ...     "single line.")
     >>> wrapped_text = mailwrapper.format(long_word)
     >>> print wrapped_text #doctest: -NORMALIZE_WHITESPACE
     This paragraph includes a long URL,
-    https://launchpad.net/products/malone/+bug/1733/+viewstatus.
+    https://launchpad.net/greenishballoon/+bug/1733/+viewstatus.
     Even though it's longer than 56 characters, it stays on
     a single line.
 
@@ -294,7 +300,8 @@
     >>> print body
     Hello Scarlett O'Hara,
     <BLANKLINE>
-    frankly-my-dear-i-dont-give-a-damn has a new message requiring your approval.
+    frankly-my-dear-i-dont-give-a-damn has a new message requiring your
+    approval.
     <BLANKLINE>
         Subject: Thing
         Author name: Rhett Butler

=== modified file 'lib/lp/bugs/browser/structuralsubscription.py'
--- lib/lp/bugs/browser/structuralsubscription.py	2011-02-03 10:35:36 +0000
+++ lib/lp/bugs/browser/structuralsubscription.py	2011-02-11 14:59:34 +0000
@@ -279,16 +279,9 @@
 
     def userIsDriver(self):
         """Has the current user driver permissions?"""
-        # XXX Tom Berger 2008-01-30 spec=subscription-invitation:
-        # The semantics of this method are actually a bit vague,
-        # since when we talk about driver permissions, we're talking
-        # about something different for each structure. For now,
-        # we only want to look at this if the target is a
+        # We only want to look at this if the target is a
         # distribution source package, in order to maintain
-        # compatibility with the bug contacts feature. We want
-        # to enable this for other targets, but probably only
-        # after implementing
-        # https://launchpad.net/malone/+spec/subscription-invitation
+        # compatibility with the bug contacts feature.
         if IDistributionSourcePackage.providedBy(self.context):
             return check_permission(
                 "launchpad.Driver", self.context.distribution)

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt	2011-02-11 14:59:34 +0000
@@ -6,8 +6,7 @@
       ...
     Unauthorized: ...
 
-(Even when the product has a bug supervisor:
-https://launchpad.net/malone/+bug/49891)
+Even when the product has a bug supervisor, see bug #49891.
 
     >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates

=== modified file 'lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt'
--- lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt	2010-10-25 13:16:10 +0000
+++ lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt	2011-02-11 14:59:34 +0000
@@ -71,8 +71,7 @@
 broken percentage when comparing with bugs marked upstream. Perhaps
 we'd solve this by separating the watched column into natively watched
 and remote watched, but I don't know how to fix this right now.  See
-https://bugs.launchpad.net/malone/+bug/188020
-    -- kiko, 2008-02-01
+bug #188020 -- kiko, 2008-02-01
 
 
 Useful links

=== modified file 'lib/lp/bugs/templates/bugwatch-error-help.pt'
--- lib/lp/bugs/templates/bugwatch-error-help.pt	2010-09-29 03:33:24 +0000
+++ lib/lp/bugs/templates/bugwatch-error-help.pt	2011-02-11 14:59:34 +0000
@@ -126,7 +126,7 @@
     </p>
     <h3>How can I help fix it?</h3>
     <p>
-      <a href="https://bugs.launchpad.dev/malone/+filebug"
+      <a href="https://bugs.launchpad.net/launchpad/+filebug"
       >File a bug</a> requesting that Launchpad support interactions
       with the remote bug tracker.
     </p>