Merge ~cjwatson/launchpad:narrative-doctest-fixes into launchpad:master

[Colin Watson]

Fix various minor lint issues in doctest narratives

These were all caught by lp-lint-doctest as "narrative exceeds 78 characters", but the fixes vary.

[Ioana Lasc (ilasc)]

review: Approve

diff --git a/lib/lp/bugs/stories/upstream-bugprivacy/xx-upstream-bug-privacy.txt b/lib/lp/bugs/stories/upstream-bugprivacy/xx-upstream-bug-privacy.txt
index a0ae7e0..168907b 100644
--- a/lib/lp/bugs/stories/upstream-bugprivacy/xx-upstream-bug-privacy.txt
+++ b/lib/lp/bugs/stories/upstream-bugprivacy/xx-upstream-bug-privacy.txt
@@ -181,42 +181,3 @@ context.
     ... """))
     HTTP/1.1 404 Not Found
     ...
-
-Sample Person views a bug, which they're about to set private:
-
-    >>> print(http(br"""
-    ... GET /firefox/+bug/4/+edit HTTP/1.1
-    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-    ... """))
-    HTTP/1.1 200 Ok
-    ...
-    ...Reflow problems with complex page layouts...
-    ...
-
-Sample Person sets the bug private and is made an explicit subscriber
-in the process.
-
-    ... POST /firefox/+bug/4/+secrecy HTTP/1.1
-    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-    ... Content-Length: 429
-    ... Content-Type: multipart/form-data; boundary=---------------------------10389799518848978361196772104
-    ... 
-    ... -----------------------------10389799518848978361196772104
-    ... Content-Disposition: form-data; name="field.private.used"
-    ... 
-    ... 
-    ... -----------------------------10389799518848978361196772104
-    ... Content-Disposition: form-data; name="field.private"
-    ... 
-    ... on
-    ... -----------------------------10389799518848978361196772104
-    ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
-    ... 
-    ... Change
-    ... -----------------------------10389799518848978361196772104--
-    ... """)
-    HTTP/1.1 200 Ok
-    ...
-    ...Cc:...
-    ...Sample Person...
-    ...
diff --git a/lib/lp/services/gpg/doc/gpg-signatures.txt b/lib/lp/services/gpg/doc/gpg-signatures.txt
index 2c46970..4f16924 100644
--- a/lib/lp/services/gpg/doc/gpg-signatures.txt
+++ b/lib/lp/services/gpg/doc/gpg-signatures.txt
@@ -137,9 +137,12 @@ signed text can not be attributed solely to either key:
     ... -----END PGP SIGNATURE-----
     ... """
 
-XXX: See discussion on the launchpad@ mailing list for an explanation to this
-change. -- Guilherme Salgado, 2007-04-05
-(https://lists.ubuntu.com/mailman/private/launchpad/2007-April/015085.html)
+Originally we could test for the exception text "Single signature expected,
+found multiple signatures", but this stopped working as of
+https://ubuntu.com/security/notices/USN-432-2
+(https://launchpad.net/ubuntu/+source/gpgme1.0/1.1.0-1ubuntu0.1), and GPGME
+now only gives us a rather less informative "Bad data" exception.  We don't
+care too much about the details as long as it fails.
 
     >>> master_sig = gpghandler.getVerifiedSignature(content)
     ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
@@ -147,12 +150,6 @@ change. -- Guilherme Salgado, 2007-04-05
     ...
     lp.services.gpg.interfaces.GPGVerificationError: ...
 
-#     >>> master_sig = gpghandler.getVerifiedSignature(content)
-#     ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
-#     Traceback (most recent call last):
-#     ...
-#     lp.services.gpg.interfaces.GPGVerificationError: Single signature expected, found multiple signatures
-
 The text below was signed by  key that's is not part of the
 imported keyring. Note that we have extra debug information containing
 the GPGME error codes (they may be helpful).
diff --git a/lib/lp/translations/utilities/doc/gettext_mo_exporter.txt b/lib/lp/translations/utilities/doc/gettext_mo_exporter.txt
index e98b784..366d9a5 100644
--- a/lib/lp/translations/utilities/doc/gettext_mo_exporter.txt
+++ b/lib/lp/translations/utilities/doc/gettext_mo_exporter.txt
@@ -8,7 +8,7 @@ friendly.
 
 You can read more about MO file format on:
 
-http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#MO-Files
+https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html
 
     >>> from zope.interface.verify import verifyObject
     >>> from lp.services.helpers import bytes_to_tarfile