launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #27447
[Merge] ~cjwatson/launchpad:doctest-source-line-length-noqa into launchpad:master
Colin Watson has proposed merging ~cjwatson/launchpad:doctest-source-line-length-noqa into launchpad:master.
Commit message:
Ignore various source line length errors in doctests
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/407267
This covers cases where it isn't reasonable or practical to wrap the source lines, such as long HTTP GET URLs.
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:doctest-source-line-length-noqa into launchpad:master.
diff --git a/lib/lp/app/stories/basics/xx-lowercase-redirection.txt b/lib/lp/app/stories/basics/xx-lowercase-redirection.txt
index ae59e84..b70b2bd 100644
--- a/lib/lp/app/stories/basics/xx-lowercase-redirection.txt
+++ b/lib/lp/app/stories/basics/xx-lowercase-redirection.txt
@@ -32,7 +32,7 @@ When doing a POST to an invalid URL, we get an error:
... POST /UbUntU/hoary/+source/evolution/+pots/evolution-2.2/es/+translate HTTP/1.1
... Host: translations.launchpad.test
... Referer: https://launchpad.test/
- ... """))
+ ... """)) # noqa
HTTP/1.1 500 Internal Server Error
...
</ul><p>...POSTToNonCanonicalURL...
diff --git a/lib/lp/blueprints/stories/blueprints/xx-productseries.txt b/lib/lp/blueprints/stories/blueprints/xx-productseries.txt
index 2dc8d95..309a17f 100644
--- a/lib/lp/blueprints/stories/blueprints/xx-productseries.txt
+++ b/lib/lp/blueprints/stories/blueprints/xx-productseries.txt
@@ -67,7 +67,7 @@ so the targeting should NOT be automatically approved.
...
... Continue
... -----------------------------26999413214087432371486976730--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
Content-Length: 0
@@ -112,7 +112,7 @@ OK, we will also pitch the e4x spec to the same series:
...
... Continue
... -----------------------------26999413214087432371486976730--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
Content-Length: 0
@@ -203,7 +203,7 @@ because we are an admin, then we will move it back.
...
... Continue
... -----------------------------26999413214087432371486976730--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
Content-Length: 0
@@ -246,7 +246,7 @@ And lets put it back:
...
... Continue
... -----------------------------26999413214087432371486976730--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
Content-Length: 0
diff --git a/lib/lp/bugs/doc/bugwatch.txt b/lib/lp/bugs/doc/bugwatch.txt
index 415be41..17e6f6a 100644
--- a/lib/lp/bugs/doc/bugwatch.txt
+++ b/lib/lp/bugs/doc/bugwatch.txt
@@ -191,7 +191,7 @@ easier you can use IBugWatchSet.fromText().
... mailto:foo.bar@xxxxxxxxxxxxx
... A Google Code URL:
... http://code.google.com/p/myproject/issues/detail?id=12345
- ... """
+ ... """ # noqa
>>> bug_watches = getUtility(IBugWatchSet).fromText(
... text, bug_one, sample_person)
>>> bugs_and_types = [
diff --git a/lib/lp/bugs/stories/bugs/xx-bugtask-assignee-widget.txt b/lib/lp/bugs/stories/bugs/xx-bugtask-assignee-widget.txt
index cff92cf..d19c86a 100644
--- a/lib/lp/bugs/stories/bugs/xx-bugtask-assignee-widget.txt
+++ b/lib/lp/bugs/stories/bugs/xx-bugtask-assignee-widget.txt
@@ -69,7 +69,7 @@ button:
...
... Save Changes
... -----------------------------19759086281403130373932339922--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
@@ -143,7 +143,7 @@ But, you can also assign the task to another person, of course:
...
... Save Changes
... -----------------------------19759086281403130373932339922--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
@@ -217,7 +217,7 @@ Lastly, the widget also allows you to simply assign the task to nobody
...
... Save Changes
... -----------------------------19759086281403130373932339922--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
diff --git a/lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt b/lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt
index 4d20e84..4200c3d 100644
--- a/lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt
+++ b/lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt
@@ -15,7 +15,7 @@ Viewing critical bugs as Sample Person:
>>> print(http(br"""
... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.importance%3Alist=Critical&search=Search HTTP/1.1
... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
- ... """))
+ ... """)) # noqa
HTTP/1.1 200 Ok
...No results for search...
@@ -24,7 +24,7 @@ Viewing bugs "assigned to me", as Sample Person:
>>> print(http(br"""
... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.assignee=name12&search=Search HTTP/1.1
... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
- ... """))
+ ... """)) # noqa
HTTP/1.1 200 Ok
...1 result...
@@ -42,7 +42,7 @@ Viewing unassigned bugs as Sample Person:
>>> print(http(br"""
... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.status-empty-marker=1&field.importance-empty-marker=1&field.assignee=&assignee_option=none&search=Search HTTP/1.1
... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
- ... """))
+ ... """)) # noqa
HTTP/1.1 200 Ok
...2 results...
diff --git a/lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt b/lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt
index ac1f245..cdaa202 100644
--- a/lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt
+++ b/lib/lp/bugs/stories/guided-filebug/xx-filebug-attachments.txt
@@ -103,6 +103,6 @@ treat all empty-equivalent values equally.
...
... Submit Bug Report
... -----------------------------2051078912280543729816242321--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other...
Location: http://bugs.launchpad.test/firefox/+bug/...
diff --git a/lib/lp/registry/stories/productseries/xx-productseries-review.txt b/lib/lp/registry/stories/productseries/xx-productseries-review.txt
index 0bdea46..638a98d 100644
--- a/lib/lp/registry/stories/productseries/xx-productseries-review.txt
+++ b/lib/lp/registry/stories/productseries/xx-productseries-review.txt
@@ -19,7 +19,7 @@ to bazaar. Also changes the name of the productseries to 'newname'.
...
... Change
... -----------------------------10572808480422220968425074--
- ... """))
+ ... """)) # noqa
HTTP/1.1 303 See Other
...
Location: http://localhost/bazaar/newname...
diff --git a/lib/lp/registry/stories/team-polls/xx-poll-condorcet-voting.txt b/lib/lp/registry/stories/team-polls/xx-poll-condorcet-voting.txt
index 3499cf1..48bfe44 100644
--- a/lib/lp/registry/stories/team-polls/xx-poll-condorcet-voting.txt
+++ b/lib/lp/registry/stories/team-polls/xx-poll-condorcet-voting.txt
@@ -49,6 +49,7 @@
... Referer: https://launchpad.test/
...
... token=xn9FDCTp4m&showvote=Show+My+Vote&option_12=&option_13=&option_14=&option_15="""))
+ ... # noqa
HTTP/1.1 200 Ok
...
<p>Your current vote is as follows:</p>
@@ -85,6 +86,7 @@
... Referer: https://launchpad.test/
...
... token=xn9FDCTp4m&option_12=2&option_13=3&option_14=4&option_15=1&changevote=Change+Vote"""))
+ ... # noqa
HTTP/1.1 200 Ok
...
...Your vote was changed successfully.</p>
@@ -173,6 +175,7 @@
... Referer: https://launchpad.test/
...
... option_16=4&option_17=2&option_18=1&option_19=3&changevote=Change+Vote"""))
+ ... # noqa
HTTP/1.1 200 Ok
...
<p>Your current vote is as follows:</p>
diff --git a/lib/lp/services/messages/doc/message.txt b/lib/lp/services/messages/doc/message.txt
index 76f95a1..f51d39a 100644
--- a/lib/lp/services/messages/doc/message.txt
+++ b/lib/lp/services/messages/doc/message.txt
@@ -113,7 +113,7 @@ unadulterated, email into the Librarian and builds all the MessageChunks.
... =00>=00
... --===============0294339828==--
... The epilogue is not included, including Unicode\N{COPYRIGHT SIGN}
- ... """.encode('latin1')
+ ... """.encode('latin1') # noqa
>>> msg = msgset.fromEmail(raw_msg)
Once the email is stuffed into the Message and MessageChunk tables and
diff --git a/lib/lp/translations/utilities/doc/gettext_po_parser.txt b/lib/lp/translations/utilities/doc/gettext_po_parser.txt
index 09f370d..5b62a50 100644
--- a/lib/lp/translations/utilities/doc/gettext_po_parser.txt
+++ b/lib/lp/translations/utilities/doc/gettext_po_parser.txt
@@ -91,7 +91,7 @@ POHeader.
... Content-Type: text/plain; charset=UTF-8
... Content-Transfer-Encoding: 8bit
... Report-Msgid-Bugs-To: serrador@xxxxxxxxxxxxx
- ... Plural-Forms: n != 1'''
+ ... Plural-Forms: n != 1''' # noqa
>>> new_header = POHeader(new_header_string)
Plural forms are now the default ones. No plural forms.
