Merge ~cjwatson/launchpad:doctest-imported-but-unused into launchpad:master

[Colin Watson]

Remove unused imports from doctests

Found by lp-lint-doctest.

[Colin Watson (cjwatson)]

Self-approving (trivial).

review: Approve

diff --git a/lib/lp/app/browser/doc/launchpad-search-pages.txt b/lib/lp/app/browser/doc/launchpad-search-pages.txt
index abc6e37..5578b26 100644
--- a/lib/lp/app/browser/doc/launchpad-search-pages.txt
+++ b/lib/lp/app/browser/doc/launchpad-search-pages.txt
@@ -5,7 +5,6 @@ Users can search for Launchpad objects and pages from the search form
 located on all pages. The search is performed and displayed by the
 LaunchpadSearchView.
 
-    >>> import six
     >>> from zope.component import getMultiAdapter, getUtility
     >>> from lp.services.webapp.interfaces import ILaunchpadRoot
     >>> from lp.services.webapp.servers import LaunchpadTestRequest
diff --git a/lib/lp/archiveuploader/tests/nascentupload-packageset.txt b/lib/lp/archiveuploader/tests/nascentupload-packageset.txt
index 6ad0c8f..3397177 100644
--- a/lib/lp/archiveuploader/tests/nascentupload-packageset.txt
+++ b/lib/lp/archiveuploader/tests/nascentupload-packageset.txt
@@ -48,7 +48,6 @@ This time the upload will fail because the ACLs don't let
 We can grant selective, package set based upload permissions to the user
 in order to facilitate uploads.
 
-    >>> import operator
     >>> def print_permission(result_set):
     ...     for perm in result_set.order_by(
     ...         'person, permission, packageset, explicit'):
diff --git a/lib/lp/archiveuploader/tests/static-translations.txt b/lib/lp/archiveuploader/tests/static-translations.txt
index 52b7a25..f6b7baa 100644
--- a/lib/lp/archiveuploader/tests/static-translations.txt
+++ b/lib/lp/archiveuploader/tests/static-translations.txt
@@ -25,8 +25,7 @@ publishing behaviour using a mock PackageUploadCustom object:
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
     >>> from lp.soyuz.enums import PackageUploadCustomFormat
-    >>> from lp.soyuz.interfaces.queue import (
-    ...     IPackageUpload, IPackageUploadCustom)
+    >>> from lp.soyuz.interfaces.queue import IPackageUploadCustom
     >>> from lp.soyuz.model.queue import PackageUploadCustom
     >>> @implementer(IPackageUploadCustom)
     ... class MockPackageUploadCustom(PackageUploadCustom):
diff --git a/lib/lp/bugs/doc/bugtask-find-similar.txt b/lib/lp/bugs/doc/bugtask-find-similar.txt
index b3396ee..204199c 100644
--- a/lib/lp/bugs/doc/bugtask-find-similar.txt
+++ b/lib/lp/bugs/doc/bugtask-find-similar.txt
@@ -13,8 +13,6 @@ It doesn't make much sense to find bugs similar to an empty string, so
 no results will be returned.
 
     >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.product import IProductSet
     >>> test_product = factory.makeProduct()
     >>> test_person = factory.makePerson()
     >>> similar_bugs = getUtility(IBugTaskSet).findSimilar(
@@ -101,7 +99,6 @@ Only bugs that the user has access to view will be searched. If we set
 one of our distro bugs to private, and repeat the search as a user who
 isn't allowed to view it, only the public bugs will show up.
 
-    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> login('[e-mail]')
     >>> distro_bug_1.setPrivate(True, distro_bug_1.owner)
     True
diff --git a/lib/lp/bugs/doc/checkwatches-batching.txt b/lib/lp/bugs/doc/checkwatches-batching.txt
index 16b165b..5700e17 100644
--- a/lib/lp/bugs/doc/checkwatches-batching.txt
+++ b/lib/lp/bugs/doc/checkwatches-batching.txt
@@ -7,7 +7,6 @@ for batching up operations.
 
     >>> import transaction
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from pprint import pprint
 
     >>> updater = CheckwatchesMaster(transaction)
     >>> transaction.commit()
diff --git a/lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt b/lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt
index e279296..e99a644 100644
--- a/lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt
+++ b/lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt
@@ -42,7 +42,6 @@ Only 'test bug a' is returned.
     ...     name='field.tag').value = 'test-tag-1 test-tag-2'
     >>> anon_browser.getControl(name='field.tags_combinator').value = ['ALL']
     >>> anon_browser.getControl('Search', index=1).click()
-    >>> from lp.bugs.tests.bug import print_bugtasks
     >>> 'test bug a' in anon_browser.contents
     True
     >>> 'test bug b' in anon_browser.contents
diff --git a/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt b/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt
index d0d49ab..3ddf93e 100644
--- a/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt
+++ b/lib/lp/code/stories/codeimport/xx-admin-codeimport.txt
@@ -11,7 +11,7 @@ to edit the details.
     ...     TargetRevisionControlSystems,
     ...     )
     >>> from lp.code.tests.helpers import GitHostingFixture
-    >>> from lp.testing import ANONYMOUS, login, logout
+    >>> from lp.testing import login, logout
     >>> login('[e-mail]')
 
     >>> svn_import = factory.makeProductCodeImport(
diff --git a/lib/lp/registry/doc/personlocation.txt b/lib/lp/registry/doc/personlocation.txt
index 779d3d9..afe5018 100644
--- a/lib/lp/registry/doc/personlocation.txt
+++ b/lib/lp/registry/doc/personlocation.txt
@@ -6,7 +6,6 @@ zone (which they can set) is stored together with their latitude/longitude (in
 PersonLocation). Until we move the time zone back to the Person table
 (bug=933699), we'll maintain the setLocation() API on IPerson.
 
-    >>> from lp.testing import verifyObject
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> personset = getUtility(IPersonSet)
 
diff --git a/lib/lp/registry/doc/poll-preconditions.txt b/lib/lp/registry/doc/poll-preconditions.txt
index f1fcc1c..b6d5dba 100644
--- a/lib/lp/registry/doc/poll-preconditions.txt
+++ b/lib/lp/registry/doc/poll-preconditions.txt
@@ -6,8 +6,6 @@ options from them, Not meeting these preconditions is a programming error and
 should be threated as so.
 
   >>> from zope.component import getUtility
-  >>> from lp.services.database.sqlbase import flush_database_updates
-  >>> from lp.testing import login
   >>> from datetime import timedelta
   >>> from lp.registry.interfaces.person import IPersonSet
   >>> from lp.registry.interfaces.poll import IPollSet
diff --git a/lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt b/lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt
index 206cfcf..1cc088e 100644
--- a/lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt
+++ b/lib/lp/registry/stories/gpg-coc/xx-gpg-coc.txt
@@ -502,7 +502,7 @@ Now they'll request their key to be reactivated.
 
 Get the token from the body of the email sent.
 
-    >>> import email, re
+    >>> import re
     >>> from lp.services.mail import stub
     >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
     >>> msg = message_from_bytes(raw_msg)
@@ -549,7 +549,6 @@ And now we can see the key listed as one of Sample Person's active keys.
 This test verifies that we correctly handle keys which are in some way
 special: either invalid, broken, revoked, expired, or already imported.
 
-  >>> import email
   >>> from lp.testing.keyserver import KeyServerTac
   >>> from lp.services.mail import stub
 
@@ -620,7 +619,6 @@ Ensure the CoC was acknowledge by searching in the CoC Admin Console:
 
 Test if the advertisement email was sent:
 
-    >>> import email
     >>> from lp.services.mail import stub
     >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
     >>> msg = message_from_bytes(raw_msg)
diff --git a/lib/lp/services/database/doc/textsearching.txt b/lib/lp/services/database/doc/textsearching.txt
index 65d8f9d..63e5d5a 100644
--- a/lib/lp/services/database/doc/textsearching.txt
+++ b/lib/lp/services/database/doc/textsearching.txt
@@ -96,7 +96,6 @@ any syntax error exceptions being generated.
 The following examples show the text version of the query using
 `_ftq(text)`, and the compiled version returned by `ftq(text)`
 
-    >>> from lp.services.database.sqlbase import SQLBase
     >>> def ftq(query):
     ...     try:
     ...         result = store.execute(
@@ -691,7 +690,6 @@ that is matched by each term. Term matching 50% or more of the total
 rows will be excluded from the final search.
 
     >>> from lp.services.database.nl_search import nl_phrase_search
-    >>> from lp.services.database.sqlbase import quote
     >>> from lp.answers.model.question import Question
 
 More than 50% of the questions matches firefox:
@@ -783,7 +781,6 @@ keywords could be eliminated. For that reason, when there are less than
 For example, there are less than 5 questions filed on the
 mozilla-firefox source package.
 
-    >>> from lp.services.database.sqlbase import sqlvalues
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> firefox_package = ubuntu.getSourcePackage('mozilla-firefox')
diff --git a/lib/lp/services/scripts/doc/launchpad-scripts.txt b/lib/lp/services/scripts/doc/launchpad-scripts.txt
index 7eea651..9a51be6 100644
--- a/lib/lp/services/scripts/doc/launchpad-scripts.txt
+++ b/lib/lp/services/scripts/doc/launchpad-scripts.txt
@@ -6,10 +6,6 @@ lp.services.scripts.base. This, along with the LaunchpadCronScript
 specialization, implement common behaviour for all Launchpad command
 line scripts.
 
-    >>> from lp.services.scripts.base import (
-    ...     LaunchpadScript, LaunchpadCronScript)
-
-
 Scripts report their executution using the standard Python logging
 module, with command line arguments and logging setup provided by
 LaunchpadScript. Unhandled exceptions from scripts are automatically
diff --git a/lib/lp/services/webservice/doc/webservice-error.txt b/lib/lp/services/webservice/doc/webservice-error.txt
index 5cf4404..47d6b31 100644
--- a/lib/lp/services/webservice/doc/webservice-error.txt
+++ b/lib/lp/services/webservice/doc/webservice-error.txt
@@ -4,7 +4,6 @@ Most of the time, if a web service client triggers an exception, the
 response code will be 500. But specific exception classes can override
 this behaviour and set some other response code.
 
-    >>> import threading
     >>> from lp.services.webapp.servers import LaunchpadTestRequest
     >>> from lp.services.webapp.adapter import (
     ...     set_request_started, clear_request_started)
diff --git a/lib/lp/translations/stories/standalone/xx-pofile-translate-dismiss-suggestions.txt b/lib/lp/translations/stories/standalone/xx-pofile-translate-dismiss-suggestions.txt
index e5fec7a..1187bda 100644
--- a/lib/lp/translations/stories/standalone/xx-pofile-translate-dismiss-suggestions.txt
+++ b/lib/lp/translations/stories/standalone/xx-pofile-translate-dismiss-suggestions.txt
@@ -5,7 +5,6 @@ translation of a message. If the current translation is good enough, new
 suggestions can be dismissed to keep them off the page.
 
     >>> from zope.component import getUtility
-    >>> from lp.testing.pages import extract_url_parameter
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet
 
     >>> login(ANONYMOUS)