launchpad-reviewers team mailing list archive

[Colin Watson <mp+407012@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:doctest-flake8 into launchpad:master.

Commit message:
Fix flake8 violations in doctest examples

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/407012
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:doctest-flake8 into launchpad:master.

diff --git a/lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt b/lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt
index a238b7c..162a674 100644
--- a/lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt
+++ b/lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt
@@ -9,7 +9,6 @@ Editing Email Address bugtasks
 
     >>> from zope.security.proxy import removeSecurityProxy
     >>> def widget_visibility(user, url):
-    ...     naked_user = removeSecurityProxy(user)
     ...     naked_email = removeSecurityProxy(user.preferredemail)
     ...     browser = setupBrowser(
     ...         "Basic %s:test" % naked_email.email)
diff --git a/lib/lp/registry/browser/tests/poll-views_0.txt b/lib/lp/registry/browser/tests/poll-views_0.txt
index 487a960..2b874a1 100644
--- a/lib/lp/registry/browser/tests/poll-views_0.txt
+++ b/lib/lp/registry/browser/tests/poll-views_0.txt
@@ -87,6 +87,7 @@ level checks.
     >>> voting_page = getMultiAdapter((poll, request), name="+vote")
     >>> form_processed = False
     >>> def form_processing():
+    ...     global form_processed
     ...     form_processed = True
     >>> voting_page.processCondorcetVotingForm = form_processing
     >>> voting_page.initialize()
diff --git a/lib/lp/services/doc/tarfile_helpers.txt b/lib/lp/services/doc/tarfile_helpers.txt
index 59b809f..27a7a83 100644
--- a/lib/lp/services/doc/tarfile_helpers.txt
+++ b/lib/lp/services/doc/tarfile_helpers.txt
@@ -117,12 +117,3 @@ created.
     uno/dos             | <directory>
     uno/dos/tres        | <directory>
     uno/dos/tres/cuatro | blah
-
-Also, if there is a duplicated file, last one is the one that remains there.
-
-    >>> archive = LaunchpadWriteTarFile.files_to_tarfile({
-    ...     'foo.po': b'blah',
-    ...     'foo.po': b'duplicated file',
-    ...     })
-    >>> examine_tarfile(archive)
-    foo.po | duplicated file