Merge lp:~sinzui/launchpad/apocalypse-interface-imports-7 into lp:launchpad

[Curtis Hovey]

This is my branch to fix the remaining glob imports in doctests.

    lp:~sinzui/launchpad/apocalypse-interface-imports-7
    Diff size: 2979
    Launchpad bug: https://bugs.launchpad.net/bugs/662669
    Test command: The whole test suite.
    Pre-implementation: no one
    Target release: 10.11

Fix the remaining glob imports in doctests
------------------------------------------

Do not import from canonical.launchpad.interfaces in doctests.

Rules
-----

    * Update the deglobber to expand multi-line import to single line imports
    * Then run the deglob doctest rules.
    * Send to ec2 to verify the tests run.

QA
--

None.

Lint
----

Lint hates these files. There are lots of long lines, moin headers, and
indentation issues. I am not inclined to fix these at this time since I
believe many of these tests should be unittests instead.

Test
----

All test changes were made via the script--no direct edits were made.

Implementation
--------------

    * Modified the deglobber helper. This is really a script that will always
      require hacks to help fix the imports from c.l.i.

[Aaron Bentley (abentley)]

Some of the reformatted imports repeat the module name (e.g. lines 25-26). AIUI, this is because a script, rather than a person, did the conversion. Please investigate updating the script to do multiline imports instead.

[Robert Collins (lifeless)]

Edwin has a script that can fix that, perhaps run it afterwards?

[Curtis Hovey (sinzui)]

I sorted the imports in all the doctests. This is a much larger change because doctests never enforced alphabetical order. I reduced the size of the change by ensuring zope imports are listed first, as we do in modules.

I have verified all the tests run and pass.

[Robert Collins (lifeless)]

Thanks curtis.

review: Approve

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/canonical/database/ftests/test_multitablecopy.txt'
--- lib/canonical/database/ftests/test_multitablecopy.txt	2008-05-19 15:24:34 +0000
+++ lib/canonical/database/ftests/test_multitablecopy.txt	2010-10-20 01:49:43 +0000
@@ -5,8 +5,8 @@
 
     >>> import transaction
     >>> from canonical.database import postgresql
+    >>> from canonical.database.multitablecopy import MultiTableCopy
     >>> from canonical.database.sqlbase import cursor
-    >>> from canonical.database.multitablecopy import MultiTableCopy
 
     >>> # Keep track of tables we'll want to clean up later
     >>> tables_to_clean_up = []

=== modified file 'lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt'
--- lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt	2010-10-20 01:49:43 +0000
@@ -11,11 +11,11 @@
 redirect to the default token view. This would happen if for example the
 user tried to re-post the form after validating one of their email addresses.
 
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILoginTokenSet, LoginTokenType)
     >>> from canonical.launchpad.browser import ValidateEmailView
+    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
+    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> foo_bar = getUtility(IPersonSet).getByName('name16')
     >>> token = getUtility(ILoginTokenSet).new(

=== modified file 'lib/canonical/launchpad/components/tests/decoratedresultset.txt'
--- lib/canonical/launchpad/components/tests/decoratedresultset.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/components/tests/decoratedresultset.txt	2010-10-20 01:49:43 +0000
@@ -10,8 +10,8 @@
 ResultSet:
 
     >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from storm.store import Store
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
     >>> store = Store.of(ubuntu)
     >>> from lp.registry.model.distribution import Distribution

=== modified file 'lib/canonical/launchpad/doc/account.txt'
--- lib/canonical/launchpad/doc/account.txt	2010-10-10 15:39:28 +0000
+++ lib/canonical/launchpad/doc/account.txt	2010-10-20 01:49:43 +0000
@@ -126,8 +126,10 @@
 If we add a new guessed email address, it will be included in the
 guessed list.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     EmailAddressStatus, IEmailAddressSet)
+    >>> from canonical.launchpad.interfaces.emailaddress import (
+    ...     EmailAddressStatus,
+    ...     IEmailAddressSet,
+    ...     )
     >>> email = getUtility(IEmailAddressSet).new(
     ...     "[e-mail]", account=account,
     ...     status=EmailAddressStatus.NEW)
@@ -294,8 +296,8 @@
 
     # We need to change database policy here again, as the SSO Server cannot
     # modify tables in the lpmain replication set.
+    >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
     >>> from canonical.launchpad.webapp.interfaces import IStoreSelector
-    >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
     >>> getUtility(IStoreSelector).push(MasterDatabasePolicy())
 
     >>> from lp.registry.interfaces.person import PersonCreationRationale

=== modified file 'lib/canonical/launchpad/doc/announcement-date-widget.txt'
--- lib/canonical/launchpad/doc/announcement-date-widget.txt	2009-08-13 19:36:01 +0000
+++ lib/canonical/launchpad/doc/announcement-date-widget.txt	2010-10-20 01:49:43 +0000
@@ -4,10 +4,10 @@
 choose to publish an announcement immediately, at a predetermined date in the
 future, or to manually publish it later.
 
+    >>> from zope.schema import Field
     >>> from canonical.launchpad.testing.pages import extract_text
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from canonical.widgets.announcementdate import AnnouncementDateWidget
-    >>> from zope.schema import Field
     >>> field = Field(__name__='foo', title=u'Foo')
     >>> widget = AnnouncementDateWidget(field, LaunchpadTestRequest())
     >>> print extract_text(widget())

=== modified file 'lib/canonical/launchpad/doc/batch_navigation.txt'
--- lib/canonical/launchpad/doc/batch_navigation.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/batch_navigation.txt	2010-10-20 01:49:43 +0000
@@ -55,8 +55,8 @@
 
 Imports and initialization:
 
+  >>> from canonical.ftests.pgsql import CursorWrapper
   >>> from canonical.launchpad.database import EmailAddress
-  >>> from canonical.ftests.pgsql import CursorWrapper
   >>> from canonical.launchpad.interfaces.lpstorm import IStore
   >>> ignore = IStore(EmailAddress) # Prime the database connection.
   ... # (Priming is important if this test is run in isolation).

=== modified file 'lib/canonical/launchpad/doc/canonical_url.txt'
--- lib/canonical/launchpad/doc/canonical_url.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/canonical_url.txt	2010-10-20 01:49:43 +0000
@@ -502,8 +502,8 @@
 
     >>> from zope.app.security.principalregistry import (
     ...     UnauthenticatedPrincipal)
+    >>> from canonical.launchpad.webapp.interaction import setupInteraction
     >>> from canonical.launchpad.webapp.servers import WebServiceTestRequest
-    >>> from canonical.launchpad.webapp.interaction import setupInteraction
     >>> from lazr.restful.utils import get_current_browser_request
     >>> anonymous = UnauthenticatedPrincipal(None, None, None)
     >>> api_request = WebServiceTestRequest()

=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-10-11 16:17:45 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-10-20 01:49:43 +0000
@@ -52,8 +52,11 @@
 
 == Persons and Teams ==
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, ICodeOfConductSet, ISignedCodeOfConductSet)
+    >>> from lp.registry.interfaces.codeofconduct import (
+    ...     ICodeOfConductSet,
+    ...     ISignedCodeOfConductSet,
+    ...     )
+    >>> from lp.registry.interfaces.person import IPersonSet
 
 The IPersonSet.
 
@@ -133,8 +136,8 @@
 
 == Projects groups and products ==
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IProjectGroupSet, IProductSet)
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
 
 The IProjectGroupSet.
 
@@ -289,8 +292,8 @@
 
 == Remote Bug Trackers and Remote Bugs ==
 
+    >>> from lp.bugs.browser.bugtracker import RemoteBug
     >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
-    >>> from lp.bugs.browser.bugtracker import RemoteBug
 
 An IBugTrackerSet.
 

=== modified file 'lib/canonical/launchpad/doc/checkbox-matrix-widget.txt'
--- lib/canonical/launchpad/doc/checkbox-matrix-widget.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/checkbox-matrix-widget.txt	2010-10-20 01:49:43 +0000
@@ -10,8 +10,11 @@
 
     >>> from BeautifulSoup import BeautifulSoup
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from canonical.launchpad.interfaces import (
-    ...     IProduct, IProductSet, License)
+    >>> from lp.registry.interfaces.product import (
+    ...     IProduct,
+    ...     IProductSet,
+    ...     License,
+    ...     )
     >>> product = getUtility(IProductSet).get(1)
     >>> licenses_field = IProduct['licenses'].bind(product)
     >>> vtype = licenses_field.value_type

=== modified file 'lib/canonical/launchpad/doc/emailauthentication.txt'
--- lib/canonical/launchpad/doc/emailauthentication.txt	2010-10-15 15:20:39 +0000
+++ lib/canonical/launchpad/doc/emailauthentication.txt	2010-10-20 01:49:43 +0000
@@ -37,9 +37,9 @@
 user in the launch bag:
 
     >>> import email
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from zope.component import getUtility
     >>> launchbag = getUtility(ILaunchBag)
     >>> name, addr = email.Utils.parseaddr(msg['From'])
     >>> from_user = getUtility(IPersonSet).getByEmail(addr)

=== modified file 'lib/canonical/launchpad/doc/feeds.txt'
--- lib/canonical/launchpad/doc/feeds.txt	2009-08-05 18:52:52 +0000
+++ lib/canonical/launchpad/doc/feeds.txt	2010-10-20 01:49:43 +0000
@@ -108,8 +108,8 @@
 by browsers and the reverse-proxy in front of the feeds servers.
 
     >>> from canonical.config import config
+    >>> from canonical.lazr.feed.feed import FeedBase
     >>> from lp.bugs.feed.bug import BugsFeedBase
-    >>> from canonical.lazr.feed.feed import FeedBase
     >>> config.launchpad.max_feed_cache_minutes
     60
     >>> config.launchpad.max_bug_feed_cache_minutes

=== modified file 'lib/canonical/launchpad/doc/gpg-encryption.txt'
--- lib/canonical/launchpad/doc/gpg-encryption.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/gpg-encryption.txt	2010-10-20 01:49:43 +0000
@@ -15,8 +15,8 @@
 
 Sample Person has public and secret keys set.
 
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login
-    >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
 
     >>> bag = getUtility(ILaunchBag)

=== modified file 'lib/canonical/launchpad/doc/gpghandler.txt'
--- lib/canonical/launchpad/doc/gpghandler.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/gpghandler.txt	2010-10-20 01:49:43 +0000
@@ -25,8 +25,10 @@
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
 
-    >>> from canonical.launchpad.interfaces import (
-    ...      IGPGHandler, IPymeKey)
+    >>> from canonical.launchpad.interfaces.gpghandler import (
+    ...     IGPGHandler,
+    ...     IPymeKey,
+    ...     )
     >>> gpghandler = getUtility(IGPGHandler)
 
 -------------------------------------------------------------------------

=== modified file 'lib/canonical/launchpad/doc/hasowner-authorization.txt'
--- lib/canonical/launchpad/doc/hasowner-authorization.txt	2010-01-12 14:52:41 +0000
+++ lib/canonical/launchpad/doc/hasowner-authorization.txt	2010-10-20 01:49:43 +0000
@@ -5,8 +5,8 @@
 
     # First we define a class which only provides IHasOwner.
     >>> from zope.interface import implements
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.role import IHasOwner
-    >>> from lp.registry.interfaces.person import IPersonSet
     >>> salgado = getUtility(IPersonSet).getByName('salgado')
     >>> class FooObject:
     ...     implements(IHasOwner)
@@ -15,8 +15,8 @@
 Salgado is the owner of any FooObject we create, so he can edit it.
 
     >>> foo = FooObject()
+    >>> from zope.component import queryAdapter
     >>> from canonical.launchpad.webapp.interfaces import IAuthorization
-    >>> from zope.component import queryAdapter
     >>> authorization = queryAdapter(foo, IAuthorization, 'launchpad.Edit')
     >>> print authorization.checkAccountAuthenticated(salgado.account)
     True

=== modified file 'lib/canonical/launchpad/doc/hierarchical-menu.txt'
--- lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-07-27 12:42:00 +0000
+++ lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-10-20 01:49:43 +0000
@@ -22,8 +22,8 @@
     >>> class ICooker(Interface):
     ...     """A cooker."""
 
+    >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
     >>> from canonical.launchpad.webapp.url import urlappend
-    >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 
     >>> class BaseContent:
     ...     implements(ICanonicalUrlData)
@@ -83,8 +83,8 @@
 IBreadcrumb adapters are registered for them.  The hierarchy builds a list of
 breadcrumbs starting with the breadcrumb closest to the hierarchy root.
 
+    >>> from canonical.launchpad.browser.launchpad import Hierarchy
     >>> from canonical.launchpad.webapp.breadcrumb import Breadcrumb
-    >>> from canonical.launchpad.browser.launchpad import Hierarchy
 
     # Monkey patch Hierarchy.makeBreadcrumbForRequestedPage so that we don't
     # have to create fake views and other stuff to test breadcrumbs here. The
@@ -174,8 +174,8 @@
 context.  The default adapter provides the url attribute, but the breadcrumb's
 text must be overriden in subclasses.
 
-    >>> from canonical.launchpad.webapp.interfaces import IBreadcrumb
     >>> from zope.interface.verify import verifyObject
+    >>> from canonical.launchpad.webapp.interfaces import IBreadcrumb
     >>> breadcrumb = Breadcrumb(cookbook)
     >>> verifyObject(IBreadcrumb, breadcrumb)
     True

=== modified file 'lib/canonical/launchpad/doc/launchpad-container.txt'
--- lib/canonical/launchpad/doc/launchpad-container.txt	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/doc/launchpad-container.txt	2010-10-20 01:49:43 +0000
@@ -7,8 +7,8 @@
 that we have an easy way of finding whether or not any given object is
 within the scope of a token's context and grant or deny access to it.
 
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchpadContainer
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.webapp.interfaces import ILaunchpadContainer
     >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.registry.interfaces.distribution import (
     ...     IDistributionSet)
@@ -80,8 +80,8 @@
 Bugs are associated to our pillars through their bug tasks, so a bug is
 said to be within any of its bugtasks' targets.
 
+    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from operator import attrgetter
-    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> bug_1 = getUtility(IBugSet).get(1)
     >>> bugtasks = bug_1.bugtasks
     >>> targets = [task.target for task in bug_1.bugtasks]

=== modified file 'lib/canonical/launchpad/doc/launchpad-target-widget.txt'
--- lib/canonical/launchpad/doc/launchpad-target-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/launchpad-target-widget.txt	2010-10-20 01:49:43 +0000
@@ -3,10 +3,10 @@
 The general +filebug allows bugs to be filed on any product or package,
 and to help with this, the LaunchpadTargetWidget is used.
 
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from canonical.launchpad.webapp.testing import verifyObject
+    >>> from canonical.widgets.launchpadtarget import LaunchpadTargetWidget
     >>> from lp.bugs.interfaces.bug import IFrontPageBugAddForm
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from canonical.widgets.launchpadtarget import LaunchpadTargetWidget
 
     >>> empty_request = LaunchpadTestRequest()
     >>> widget = LaunchpadTargetWidget(
@@ -14,8 +14,8 @@
 
 The widget complies to both IInputWidget and IBrowserWidget.
 
+    >>> from zope.app.form.browser.interfaces import IBrowserWidget
     >>> from zope.app.form.interfaces import IInputWidget
-    >>> from zope.app.form.browser.interfaces import IBrowserWidget
     >>> verifyObject(IInputWidget, widget)
     True
     >>> verifyObject(IBrowserWidget, widget)

=== modified file 'lib/canonical/launchpad/doc/launchpadform.txt'
--- lib/canonical/launchpad/doc/launchpadform.txt	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/doc/launchpadform.txt	2010-10-20 01:49:43 +0000
@@ -131,8 +131,8 @@
 attribute:
 
   >>> from zope.app.form.browser import TextWidget
+  >>> from canonical.launchpad.webapp import custom_widget
   >>> from canonical.widgets import PasswordChangeWidget
-  >>> from canonical.launchpad.webapp import custom_widget
 
   >>> class FormTestView3(LaunchpadFormView):
   ...     schema = IFormTest
@@ -469,9 +469,9 @@
 First we'll create a fake pagetemplate which doesn't use Launchpad's main
 template and thus is way simpler.
 
-  >>> from z3c.ptcompat import ViewPageTemplateFile
   >>> from StringIO import StringIO
   >>> from tempfile import mkstemp
+  >>> from z3c.ptcompat import ViewPageTemplateFile
   >>> file, filename = mkstemp()
   >>> f = open(filename, 'w')
   >>> f.write(u'<div metal:use-macro="context/@@launchpad_form/form" />')

=== modified file 'lib/canonical/launchpad/doc/lazr-js-widgets.txt'
--- lib/canonical/launchpad/doc/lazr-js-widgets.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/lazr-js-widgets.txt	2010-10-20 01:49:43 +0000
@@ -82,8 +82,8 @@
 The InlineEditPickerWidget can be used for any interface attribute that
 has a vocabulary defined for it.
 
+    >>> from zope.component import getUtility
     >>> from canonical.widgets.lazrjs import InlineEditPickerWidget
-    >>> from zope.component import getUtility
     >>> from lp.bugs.interfaces.bugtask import IBugTask, IBugTaskSet
     >>> bugtask = getUtility(IBugTaskSet).get(2)
     >>> def create_inline_edit_picker_widget():

=== modified file 'lib/canonical/launchpad/doc/librarian.txt'
--- lib/canonical/launchpad/doc/librarian.txt	2010-10-10 15:39:28 +0000
+++ lib/canonical/launchpad/doc/librarian.txt	2010-10-20 01:49:43 +0000
@@ -28,8 +28,8 @@
 
 == High Level ==
 
+    >>> from StringIO import StringIO
     >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-    >>> from StringIO import StringIO
     >>> data = 'This is some data'
 
 We can create LibraryFileAliases using the ILibraryFileAliasSet utility.
@@ -118,8 +118,8 @@
 However, we can force the use of HTTP by setting the 'HTTP_X_SCHEME'
 header in the request to 'http', even when 'use_https' is True.
 
+    >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from zope.component import getMultiAdapter
     >>> from urlparse import urlparse
     >>> request = LaunchpadTestRequest(
     ...     environ={'REQUEST_METHOD': 'GET',
@@ -573,9 +573,9 @@
 
 XXX bug=631884 we have to establish the flags object manually for testing.
 
+    >>> from lp.services.features import per_thread
+    >>> from lp.services.features.flags import FeatureController
     >>> from lp.services.features.webapp import ScopesFromRequest
-    >>> from lp.services.features.flags import FeatureController
-    >>> from lp.services.features import per_thread
     >>> per_thread.features = FeatureController(
     ...     ScopesFromRequest(empty_request).lookup)
 

=== modified file 'lib/canonical/launchpad/doc/location-widget.txt'
--- lib/canonical/launchpad/doc/location-widget.txt	2010-09-21 04:21:16 +0000
+++ lib/canonical/launchpad/doc/location-widget.txt	2010-10-20 01:49:43 +0000
@@ -3,9 +3,9 @@
 A widget used when setting the geographic location of a given person.
 
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from canonical.widgets.location import LocationWidget
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.services.fields import LocationField
-    >>> from canonical.widgets.location import LocationWidget
     >>> salgado = getUtility(IPersonSet).getByName('salgado')
     >>> field = LocationField(__name__='location', title=u'Location')
 

=== modified file 'lib/canonical/launchpad/doc/logintoken-pages.txt'
--- lib/canonical/launchpad/doc/logintoken-pages.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/logintoken-pages.txt	2010-10-20 01:49:43 +0000
@@ -21,8 +21,8 @@
     >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
     >>> from canonical.launchpad.interfaces.logintoken import (
     ...     ILoginTokenSet)
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.registry.model.person import PersonSet
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
     # To simplify our tests we'll use the PersonSet() class directly instead
     # of gettint it as a zope secured utility. If we don't do that we'd have

=== modified file 'lib/canonical/launchpad/doc/logintoken.txt'
--- lib/canonical/launchpad/doc/logintoken.txt	2009-05-12 01:39:29 +0000
+++ lib/canonical/launchpad/doc/logintoken.txt	2010-10-20 01:49:43 +0000
@@ -18,12 +18,12 @@
     4) The token is now marked as consumed, together with any other
        tokens of the same type and for the same email address.
 
+    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
     >>> from lp.registry.model.person import Person
-    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
     >>> from canonical.launchpad.interfaces.logintoken import (
     ...     ILoginTokenSet)
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from lp.services.mail import stub
-    >>> from canonical.database.sqlbase import flush_database_updates
     >>> import transaction
     >>> foobar = Person.byName('name16')
 
@@ -96,8 +96,8 @@
 our own making.
 
     >>> import pytz
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from datetime import datetime
-    >>> from zope.security.proxy import removeSecurityProxy
 
     >>> token = removeSecurityProxy(token)
     >>> token.date_consumed = datetime(

=== modified file 'lib/canonical/launchpad/doc/looptuner.txt'
--- lib/canonical/launchpad/doc/looptuner.txt	2010-04-07 15:57:55 +0000
+++ lib/canonical/launchpad/doc/looptuner.txt	2010-10-20 01:49:43 +0000
@@ -20,8 +20,8 @@
 
     >>> import math
     >>> from zope.interface import implements
+    >>> from canonical.launchpad.interfaces.looptuner import ITunableLoop
     >>> from canonical.launchpad.utilities.looptuner import LoopTuner
-    >>> from canonical.launchpad.interfaces.looptuner import ITunableLoop
 
 The LoopTuner requires the operation you define for it to implement the
 ITunableLoop interface.

=== modified file 'lib/canonical/launchpad/doc/lower-case-text-widget.txt'
--- lib/canonical/launchpad/doc/lower-case-text-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/lower-case-text-widget.txt	2010-10-20 01:49:43 +0000
@@ -7,9 +7,9 @@
 LowerCaseTextWidget can be used to automatically convert the input to
 lower case:
 
+  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+  >>> from canonical.widgets.textwidgets import LowerCaseTextWidget
   >>> from lp.bugs.interfaces.bug import IBug
-  >>> from canonical.widgets.textwidgets import LowerCaseTextWidget
-  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> field = IBug['description']
   >>> request = LaunchpadTestRequest(form={'field.description':'Foo'})
   >>> widget = LowerCaseTextWidget(field, request)

=== modified file 'lib/canonical/launchpad/doc/menus.txt'
--- lib/canonical/launchpad/doc/menus.txt	2009-10-21 17:41:20 +0000
+++ lib/canonical/launchpad/doc/menus.txt	2010-10-20 01:49:43 +0000
@@ -341,8 +341,8 @@
     # We need to use a real launchpad test request so the view adapter
     # lookups will work.  That request also needs to implement
     # IParticipation so that the login machinery will work.
+    >>> from zope.security.interfaces import IParticipation
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from zope.security.interfaces import IParticipation
     >>> class InteractiveTestRequest(LaunchpadTestRequest):
     ...     implements(IParticipation)
     ...     principal = None
@@ -687,10 +687,10 @@
 link should appear linked. The request is also set as the menu's
 'request' attribute.
 
+    >>> from zope.publisher.interfaces.browser import IBrowserRequest
+    >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
     >>> from canonical.launchpad.ftests import test_tales
     >>> from canonical.launchpad.webapp import LaunchpadView
-    >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
-    >>> from zope.publisher.interfaces.browser import IBrowserRequest
     >>> from canonical.launchpad.webapp.vhosts import allvhosts
     >>> class FakeRequest:
     ...     implements(IHTTPApplicationRequest, IBrowserRequest)

=== modified file 'lib/canonical/launchpad/doc/message.txt'
--- lib/canonical/launchpad/doc/message.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/message.txt	2010-10-20 01:49:43 +0000
@@ -4,8 +4,9 @@
 various parts of launchpad. Currently, it is used by Malone for comments
 on bugs. Bugs are linked to Messages via the BugMessage table.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugMessageSet, IBugSet, IOpenLaunchBag)
+    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
     >>> login('[e-mail]')
     >>> bugmessageset = getUtility(IBugMessageSet)
     >>> bug_one = getUtility(IBugSet).get(1)

=== modified file 'lib/canonical/launchpad/doc/navigation.txt'
--- lib/canonical/launchpad/doc/navigation.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/navigation.txt	2010-10-20 01:49:43 +0000
@@ -269,8 +269,8 @@
 Once registered, we can look the navigation up using getMultiAdapter().
 
     >>> from zope.component import getMultiAdapter
+    >>> from zope.publisher.interfaces.browser import IBrowserPublisher
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from zope.publisher.interfaces.browser import IBrowserPublisher
     >>> navigation = getMultiAdapter(
     ...     (thingset, LaunchpadTestRequest()), IBrowserPublisher, name='')
 

=== modified file 'lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt'
--- lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 
 This custom widget is used to replace new line characters to spaces.
 
+  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> from canonical.widgets.bugtask import NewLineToSpacesWidget
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> from lp.bugs.interfaces.bugtask import IBugTaskSearch
 
 We pass a string with some new line characters to the widget

=== modified file 'lib/canonical/launchpad/doc/notification-recipient-set.txt'
--- lib/canonical/launchpad/doc/notification-recipient-set.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/notification-recipient-set.txt	2010-10-20 01:49:43 +0000
@@ -15,8 +15,8 @@
 You can use it as is or derive from it
 (see bugnotificationrecipients.txt for an example of a derivation).
 
+    >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
     >>> from canonical.launchpad.mailnotification import (
     ...     NotificationRecipientSet)
 

=== modified file 'lib/canonical/launchpad/doc/notification-text-escape.txt'
--- lib/canonical/launchpad/doc/notification-text-escape.txt	2008-04-16 16:28:14 +0000
+++ lib/canonical/launchpad/doc/notification-text-escape.txt	2010-10-20 01:49:43 +0000
@@ -41,8 +41,8 @@
 IStructuredString interface, then a string will be returned with the
 appropriate sections escaped and unescaped.
 
+    >>> from canonical.launchpad.webapp.interfaces import IStructuredString
     >>> from canonical.launchpad.webapp.menu import structured
-    >>> from canonical.launchpad.webapp.interfaces import IStructuredString
     >>> msg = u'<b>%(escaped)s</b>'
     >>> structured_text = structured(msg, escaped=u'<br/>foo')
     >>> IStructuredString.providedBy(structured_text)

=== modified file 'lib/canonical/launchpad/doc/oauth.txt'
--- lib/canonical/launchpad/doc/oauth.txt	2010-10-18 10:11:04 +0000
+++ lib/canonical/launchpad/doc/oauth.txt	2010-10-20 01:49:43 +0000
@@ -13,9 +13,14 @@
     >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from canonical.launchpad.webapp.interfaces import (
     ...     AccessLevel, OAuthPermission)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IOAuthAccessToken, IOAuthConsumer, IOAuthConsumerSet,
-    ...     IOAuthNonce, IOAuthRequestToken, IPersonSet)
+    >>> from canonical.launchpad.interfaces.oauth import (
+    ...     IOAuthAccessToken,
+    ...     IOAuthConsumer,
+    ...     IOAuthConsumerSet,
+    ...     IOAuthNonce,
+    ...     IOAuthRequestToken,
+    ...     )
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> consumer_set = getUtility(IOAuthConsumerSet)
     >>> verifyObject(IOAuthConsumerSet, consumer_set)
     True

=== modified file 'lib/canonical/launchpad/doc/object-privacy.txt'
--- lib/canonical/launchpad/doc/object-privacy.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/object-privacy.txt	2010-10-20 01:49:43 +0000
@@ -8,8 +8,9 @@
 IObjectPrivacy and check its is_private attribute.
 
     >>> from canonical.lazr.interfaces import IObjectPrivacy
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IPersonSet, IQuestionSet)
+    >>> from lp.answers.interfaces.questioncollection import IQuestionSet
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> bug = getUtility(IBugSet).get(1)
     >>> bug.private
     False

=== modified file 'lib/canonical/launchpad/doc/package-relationship.txt'
--- lib/canonical/launchpad/doc/package-relationship.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/package-relationship.txt	2010-10-20 01:49:43 +0000
@@ -54,8 +54,8 @@
 Now for each parsed element we can build an IPackageRelationship:
 
   >>> from canonical.launchpad.browser import PackageRelationship
+  >>> from canonical.launchpad.interfaces.packagerelationship import IPackageRelationship
   >>> from canonical.launchpad.webapp.testing import verifyObject
-  >>> from canonical.launchpad.interfaces.packagerelationship import IPackageRelationship
 
   >>> name, version, operator = parsed_relationships[1]
   >>> fake_url = 'http://host/path'

=== modified file 'lib/canonical/launchpad/doc/presenting-lengths-of-time.txt'
--- lib/canonical/launchpad/doc/presenting-lengths-of-time.txt	2005-10-31 18:29:12 +0000
+++ lib/canonical/launchpad/doc/presenting-lengths-of-time.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 
 First, let's bring in some dependencies:
 
+   >>> from canonical.launchpad.ftests import test_tales
    >>> from datetime import timedelta
-   >>> from canonical.launchpad.ftests import test_tales
 
 Exact Duration
 --------------

=== modified file 'lib/canonical/launchpad/doc/project-scope-widget.txt'
--- lib/canonical/launchpad/doc/project-scope-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/project-scope-widget.txt	2010-10-20 01:49:43 +0000
@@ -7,9 +7,9 @@
 we will use the Project vocabulary which allows any project to be
 selected.
 
-    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from zope.schema import Choice
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from canonical.widgets.project import ProjectScopeWidget
 
     >>> empty_request = LaunchpadTestRequest()
@@ -21,8 +21,8 @@
 
 The widget complies to both IInputWidget and IBrowserWidget.
 
+    >>> from zope.app.form.browser.interfaces import IBrowserWidget
     >>> from zope.app.form.interfaces import IInputWidget
-    >>> from zope.app.form.browser.interfaces import IBrowserWidget
     >>> verifyObject(IInputWidget, widget)
     True
     >>> verifyObject(IBrowserWidget, widget)

=== modified file 'lib/canonical/launchpad/doc/security-proxies.txt'
--- lib/canonical/launchpad/doc/security-proxies.txt	2010-10-17 02:00:18 +0000
+++ lib/canonical/launchpad/doc/security-proxies.txt	2010-10-20 01:49:43 +0000
@@ -45,8 +45,8 @@
 XXX: bug 3315
 DB schema objects should be comparable correctly when proxied...
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     SeriesStatus, IDistroSeriesSet)
+    >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
+    >>> from lp.registry.interfaces.series import SeriesStatus
     >>> hoary = getUtility(IDistroSeriesSet).get(3)
     >>> print hoary.status.name
     DEVELOPMENT

=== modified file 'lib/canonical/launchpad/doc/signedmessage.txt'
--- lib/canonical/launchpad/doc/signedmessage.txt	2007-08-09 14:49:07 +0000
+++ lib/canonical/launchpad/doc/signedmessage.txt	2010-10-20 01:49:43 +0000
@@ -6,9 +6,9 @@
 SignedMessage as the _class parameter, but it also ensures that all
 the attributes are correctly set.
 
+    >>> from canonical.launchpad.interfaces.mail import ISignedMessage
+    >>> from canonical.launchpad.mail import signed_message_from_string
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.mail import signed_message_from_string
-    >>> from canonical.launchpad.interfaces.mail import ISignedMessage
     >>> msg = signed_message_from_string('To: someone\n\nHello.')
     >>> verifyObject(ISignedMessage, msg)
     True

=== modified file 'lib/canonical/launchpad/doc/sqlobject-security-proxies.txt'
--- lib/canonical/launchpad/doc/sqlobject-security-proxies.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/sqlobject-security-proxies.txt	2010-10-20 01:49:43 +0000
@@ -3,9 +3,9 @@
 
 Do some imports.
 
+    >>> from zope.component import getUtility
+    >>> from lp.bugs.model.bug import BugTask
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.bugs.model.bug import BugTask
-    >>> from zope.component import getUtility
 
 Login as Mark.
 

=== modified file 'lib/canonical/launchpad/doc/storm.txt'
--- lib/canonical/launchpad/doc/storm.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/storm.txt	2010-10-20 01:49:43 +0000
@@ -6,14 +6,21 @@
 In addition to what Storm provides, we also have some Launchpad
 specific Storm tools to cope with our master and slave store arrangement.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     EmailAddressStatus, IEmailAddressSet,
-    ...     IMasterObject, IMasterStore, ISlaveStore, IStore)
+    >>> from canonical.launchpad.interfaces.emailaddress import (
+    ...     EmailAddressStatus,
+    ...     IEmailAddressSet,
+    ...     )
+    >>> from canonical.launchpad.interfaces.lpstorm import (
+    ...     IMasterObject,
+    ...     IMasterStore,
+    ...     ISlaveStore,
+    ...     IStore,
+    ...     )
     >>> from canonical.launchpad.database import (
     ...     Account, AccountPassword, EmailAddress)
+    >>> from zope.security.proxy import ProxyFactory
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.model.person import Person
-    >>> from zope.security.proxy import ProxyFactory
 
 
 You need to use the correct master Store to make changes to

=== modified file 'lib/canonical/launchpad/doc/stripped-text-widget.txt'
--- lib/canonical/launchpad/doc/stripped-text-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/stripped-text-widget.txt	2010-10-20 01:49:43 +0000
@@ -30,8 +30,8 @@
 
 This custom widget is used to strip leading and trailing whitespaces.
 
+  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> from canonical.widgets.textwidgets import StrippedTextWidget
-  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> from lp.bugs.interfaces.bugtracker import IRemoteBug
 
 We pass a string with leading and trailing whitespaces to the widget

=== modified file 'lib/canonical/launchpad/doc/textsearching.txt'
--- lib/canonical/launchpad/doc/textsearching.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/textsearching.txt	2010-10-20 01:49:43 +0000
@@ -602,8 +602,8 @@
 rows will be excluded from the final search.
 
     >>> from canonical.database.nl_search import nl_phrase_search
+    >>> from canonical.database.sqlbase import quote
     >>> from lp.answers.model.question import Question
-    >>> from canonical.database.sqlbase import quote
 
 More than 50% of the questions matches firefox:
 
@@ -689,8 +689,8 @@
 For example, there are less than 5 questions filed on the
 mozilla-firefox source package.
 
+    >>> from canonical.database.sqlbase import sqlvalues
     >>> from lp.registry.interfaces.distribution import IDistributionSet
-    >>> from canonical.database.sqlbase import sqlvalues
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> firefox_package = ubuntu.getSourcePackage('mozilla-firefox')
     >>> firefox_package_questions = Question.select(

=== modified file 'lib/canonical/launchpad/doc/timeout.txt'
--- lib/canonical/launchpad/doc/timeout.txt	2010-10-02 20:58:22 +0000
+++ lib/canonical/launchpad/doc/timeout.txt	2010-10-20 01:49:43 +0000
@@ -26,8 +26,8 @@
 The timeout to use is the number of seconds remaining before
 db_statement_timeout is expired.
 
+    >>> from canonical.config import config
     >>> from textwrap import dedent
-    >>> from canonical.config import config
     >>> config.push('timeout', dedent('''\
     ... [database]
     ... db_statement_timeout = 10000'''))
@@ -88,9 +88,9 @@
 
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.services.features.model import FeatureFlag, getFeatureStore
+    >>> from lp.services.features import per_thread
+    >>> from lp.services.features.flags import FeatureController
     >>> from lp.services.features.webapp import ScopesFromRequest
-    >>> from lp.services.features.flags import FeatureController
-    >>> from lp.services.features import per_thread
 
 Install the feature flag to increase the timeout value.
 

=== modified file 'lib/canonical/launchpad/doc/tokens-text-widget.txt'
--- lib/canonical/launchpad/doc/tokens-text-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/tokens-text-widget.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 This custom widget is used to normalise the space between words,
 strip punctuation, and strip leading and trailing whitespace.
 
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from canonical.widgets.textwidgets import TokensTextWidget
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.answers.interfaces.faq import IFAQ
 
 The IFAQ keywords field requires a space separated list of terms. In the

=== modified file 'lib/canonical/launchpad/doc/validation.txt'
--- lib/canonical/launchpad/doc/validation.txt	2010-10-10 15:39:28 +0000
+++ lib/canonical/launchpad/doc/validation.txt	2010-10-20 01:49:43 +0000
@@ -7,9 +7,10 @@
 The validate_distrotask() function is used to guarantee that distribution
 bugtasks are unique per bug.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IDistributionSet, ISourcePackageNameSet,
-    ...     validate_distrotask)
+    >>> from canonical.launchpad.interfaces import validate_distrotask
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
     >>> bug_two = getUtility(IBugSet).get(2)
     >>> debian = getUtility(IDistributionSet).getByName('debian')
     >>> mozilla_firefox = getUtility(
@@ -31,8 +32,8 @@
 If the bug already has a distribution task with no source package, it's
 not possible to add a another one.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     CreateBugParams, IDistributionSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> login('[e-mail]')
     >>> no_priv = getUtility(ILaunchBag).user
@@ -57,8 +58,8 @@
 It's not allowed even if the sourcepackage has been published in a
 PPA.
 
+    >>> from lp.soyuz.enums import PackagePublishingStatus
     >>> from lp.soyuz.tests.ppa import publishToPPA
-    >>> from lp.soyuz.enums import PackagePublishingStatus
     >>> publishToPPA(
     ...     person_name='cprov',
     ...     sourcepackage_name='foobar',

=== modified file 'lib/canonical/launchpad/doc/vocabularies.txt'
--- lib/canonical/launchpad/doc/vocabularies.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/vocabularies.txt	2010-10-20 01:49:43 +0000
@@ -10,9 +10,11 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import ANONYMOUS, login
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, IOpenLaunchBag, IProductSet, IProjectGroupSet)
     >>> from canonical.database.sqlbase import flush_database_updates
+    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
     >>> person_set = getUtility(IPersonSet)
     >>> product_set = getUtility(IProductSet)
     >>> login('[e-mail]')
@@ -395,8 +397,8 @@
 Bug watches with an email address URL (i.e. starts with "mailto:") are
 treated differently.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugWatchSet, IBugTrackerSet)
+    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
 
     >>> bug_twelve = getUtility(IBugSet).get(12)
     >>> email_bugtracker = getUtility(IBugTrackerSet).getByName('email')

=== modified file 'lib/canonical/launchpad/doc/webapp-authorization.txt'
--- lib/canonical/launchpad/doc/webapp-authorization.txt	2010-10-18 10:11:04 +0000
+++ lib/canonical/launchpad/doc/webapp-authorization.txt	2010-10-20 01:49:43 +0000
@@ -5,8 +5,8 @@
 given object.  This is the same check available in TALES as
 something/required:permission.Name.
 
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.authorization import check_permission
-    >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> personset = getUtility(IPersonSet)
@@ -60,8 +60,8 @@
 access to private objects.  For instance, the above principal has
 permission to read private and non-private objects (READ_PRIVATE).
 
+    >>> from canonical.launchpad.ftests import syncUpdate
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.ftests import syncUpdate
     >>> login('[e-mail]')
     >>> bug_1 = getUtility(IBugSet).get(1)
     >>> bug_1.setPrivate(True, sample_person)

=== modified file 'lib/canonical/launchpad/doc/webapp-publication.txt'
--- lib/canonical/launchpad/doc/webapp-publication.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/webapp-publication.txt	2010-10-20 01:49:43 +0000
@@ -144,8 +144,8 @@
     ...     LaunchpadBrowserPublication)
     >>> from canonical.launchpad.webapp.servers import (
     ...     LaunchpadBrowserRequest, VirtualHostRequestPublicationFactory)
+    >>> from zope.app.publication.interfaces import IRequestPublicationFactory
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from zope.app.publication.interfaces import IRequestPublicationFactory
 
 Those factories provide the IRequestPublicationFactory interface.
 
@@ -909,10 +909,10 @@
 In the default implementation, the following database modification will
 be automatically reverted in a GET request.
 
+    >>> from canonical.launchpad.database import EmailAddress
     >>> from canonical.launchpad.ftests import syncUpdate
-    >>> from canonical.launchpad.database import EmailAddress
+    >>> from canonical.launchpad.interfaces.lpstorm import IMasterStore
     >>> from lp.registry.model.person import Person
-    >>> from canonical.launchpad.interfaces.lpstorm import IMasterStore
     >>> login('[e-mail]')
     >>> txn = transaction.begin()
     >>> def get_foo_bar_person():
@@ -965,13 +965,13 @@
 the OAuthNonce table.
 
     >>> import time
+    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
     >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
 
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
     >>> from canonical.launchpad.webapp.interfaces import IStoreSelector
-    >>> from zope.component import getUtility
     >>> getUtility(IStoreSelector).push(MasterDatabasePolicy())
 
     >>> salgado = getUtility(IPersonSet).getByName('salgado')

=== modified file 'lib/canonical/launchpad/doc/webservice-configuration.txt'
--- lib/canonical/launchpad/doc/webservice-configuration.txt	2009-04-17 10:32:16 +0000
+++ lib/canonical/launchpad/doc/webservice-configuration.txt	2010-10-20 01:49:43 +0000
@@ -24,8 +24,8 @@
 based on the site configuration and whether the requesting user is a
 developer.
 
+    >>> from canonical.config import config
     >>> from textwrap import dedent
-    >>> from canonical.config import config
 
     >>> from zope.interface import implements
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag

=== modified file 'lib/canonical/launchpad/doc/webservice-marshallers.txt'
--- lib/canonical/launchpad/doc/webservice-marshallers.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/webservice-marshallers.txt	2010-10-20 01:49:43 +0000
@@ -8,8 +8,10 @@
 application root.
 
     >>> from canonical.launchpad.webapp.adapter import set_request_started
-    >>> from canonical.launchpad.webapp.servers import WebServiceTestRequest
-    >>> from canonical.launchpad.webapp.servers import WebServicePublication
+    >>> from canonical.launchpad.webapp.servers import (
+    ...     WebServicePublication,
+    ...     WebServiceTestRequest,
+    ...     )
     >>> request = WebServiceTestRequest(method='GET')
     >>> set_request_started()
     >>> request.setPublication(WebServicePublication(None))
@@ -29,12 +31,12 @@
 string is a URL corresponding to a vocabulary item, the marshaller
 returns that item. Otherwise it raises a ValueError.
 
-    >>> from lp.registry.interfaces.person import IPerson
     >>> from zope.component import getMultiAdapter
     >>> from zope.schema import Choice
+    >>> from lazr.restful import EntryResource
     >>> from lazr.restful.fields import ReferenceChoice
     >>> from lazr.restful.interfaces import IFieldMarshaller
-    >>> from lazr.restful import EntryResource
+    >>> from lp.registry.interfaces.person import IPerson
 
     # Bind the field, to resolve the vocabulary name.
     >>> field = ReferenceChoice(

=== modified file 'lib/canonical/launchpad/doc/xmlrpc-authserver.txt'
--- lib/canonical/launchpad/doc/xmlrpc-authserver.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/doc/xmlrpc-authserver.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,10 @@
 The AuthServer interface is available on the authserver attribute
 of our private XMLRPC instance.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IAuthServerApplication, IPrivateApplication)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     IAuthServerApplication,
+    ...     IPrivateApplication,
+    ...     )
     >>> from canonical.launchpad.webapp.testing import verifyObject
 
     >>> private_root = getUtility(IPrivateApplication)

=== modified file 'lib/canonical/launchpad/interfaces/ftests/validation.txt'
--- lib/canonical/launchpad/interfaces/ftests/validation.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/interfaces/ftests/validation.txt	2010-10-20 01:49:43 +0000
@@ -1,16 +1,17 @@
 = Launchpad field validators =
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     CreateBugParams, IOpenLaunchBag, IPersonSet, IProductSet)
+    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
 
 == can_be_nominated_for_series ==
 
 This validator is used to check if the bug in the launchbag can be
 nominated for the given series.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     can_be_nominated_for_series)
+    >>> from canonical.launchpad.interfaces import can_be_nominated_for_series
 
 If we create a new bug, all the target's series can be nominated.
 

=== modified file 'lib/canonical/launchpad/pagetests/feeds/xx-links.txt'
--- lib/canonical/launchpad/pagetests/feeds/xx-links.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/pagetests/feeds/xx-links.txt	2010-10-20 01:49:43 +0000
@@ -116,8 +116,11 @@
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> login('[e-mail]')
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchBag, IProductSet, License)
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.registry.interfaces.product import (
+    ...     IProductSet,
+    ...     License,
+    ...     )
     >>> user = getUtility(ILaunchBag).user
     >>> getUtility(IProductSet).createProduct(
     ...     user, 'bad-displayname',

=== modified file 'lib/canonical/launchpad/pagetests/oauth/access-token.txt'
--- lib/canonical/launchpad/pagetests/oauth/access-token.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/pagetests/oauth/access-token.txt	2010-10-20 01:49:43 +0000
@@ -5,10 +5,11 @@
 access token.
 
     # First we create a new request token and review it.
+    >>> from zope.component import getUtility
+    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
     >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
-    >>> from canonical.launchpad.interfaces import (
-    ...     IOAuthConsumerSet, IPersonSet, IProductSet)
-    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from canonical.launchpad.ftests import login, logout
     >>> login('[e-mail]')
     >>> consumer = getUtility(IOAuthConsumerSet).getByKey('foobar123451432')

=== modified file 'lib/canonical/launchpad/pagetests/oauth/authorize-token.txt'
--- lib/canonical/launchpad/pagetests/oauth/authorize-token.txt	2010-10-18 10:11:04 +0000
+++ lib/canonical/launchpad/pagetests/oauth/authorize-token.txt	2010-10-20 01:49:43 +0000
@@ -5,8 +5,8 @@
 and authorize or not the consumer to act on his behalf.
 
     # Create a new request token.
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
-    >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
     >>> login('[e-mail]')
     >>> consumer = getUtility(IOAuthConsumerSet).getByKey('foobar123451432')

=== modified file 'lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt'
--- lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt	2010-10-20 01:49:43 +0000
@@ -5,9 +5,10 @@
 
     # Create a request token, but don't convert it to an access token.
     >>> from zope.component import getUtility
+    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
     >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
-    >>> from canonical.launchpad.interfaces import (
-    ...     IOAuthConsumerSet, IPersonSet, IProductSet)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> login('[e-mail]')
     >>> token = getUtility(IOAuthConsumerSet).getByKey(
     ...     'foobar123451432').newRequestToken()

=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2010-10-20 01:49:43 +0000
@@ -261,8 +261,8 @@
 
 But our database connections are broken.
 
+    >>> from canonical.launchpad.interfaces.lpstorm import IStore
     >>> from lp.registry.model.person import Person
-    >>> from canonical.launchpad.interfaces.lpstorm import IStore
     >>> IStore(Person).find(Person, name='janitor')
     Traceback (most recent call last):
     ...

=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt	2010-07-05 19:25:14 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt	2010-10-20 01:49:43 +0000
@@ -6,9 +6,9 @@
 slightly longer then the soft_request_timeout value to generate, thus
 causing a soft timeout to be logged.
 
-    >>> from textwrap import dedent
     >>> from canonical.config import config
     >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
+    >>> from textwrap import dedent
     >>> old_lastid = globalErrorUtility.getLastOopsReport().id
     >>> test_data = dedent("""
     ...     [database]

=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt	2010-07-05 19:25:14 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt	2010-10-20 01:49:43 +0000
@@ -39,8 +39,8 @@
 slightly longer then the soft_request_timeout value to generate, thus
 causing a soft timeout to be logged.
 
+    >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
     >>> from textwrap import dedent
-    >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
     >>> old_lastid = globalErrorUtility.getLastOopsReport().id
     >>> test_data = (dedent("""
     ...     [database]

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-service.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2010-10-20 01:49:43 +0000
@@ -45,8 +45,8 @@
     >>> config.push('beta_data', beta_data)
 
     >>> from lp.testing import ANONYMOUS, login, logout
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.testing.pages import webservice_for_person
-    >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> login(ANONYMOUS)
     >>> beta_admin = getUtility(IPersonSet).getByEmail(

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2010-03-29 14:30:51 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2010-10-20 01:49:43 +0000
@@ -61,8 +61,8 @@
 
 Unlike the test strings we used earlier, this is a valid WADL file.
 
+    >>> from canonical.lazr.xml import XMLValidator
     >>> from lazr.restful import WADL_SCHEMA_FILE
-    >>> from canonical.lazr.xml import XMLValidator
     >>> wadl_schema = XMLValidator(WADL_SCHEMA_FILE)
 
     # We need to replace the nbsp entity, because the validator

=== modified file 'lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled'
--- lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled	2009-06-02 08:20:49 +0000
+++ lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled	2010-10-20 01:49:43 +0000
@@ -16,9 +16,9 @@
 First we create a view that will provoke a TimeoutError, a view for the
 exception, and a time machine.
 
+    >>> from zope.publisher.browser import BrowserView
+    >>> from zope.testbrowser.testing import Browser
     >>> from textwrap import dedent
-    >>> from zope.testbrowser.testing import Browser
-    >>> from zope.publisher.browser import BrowserView
     >>> from zope.publisher.interfaces.browser import (
     ...     IBrowserRequest, IBrowserView, IBrowserPublisher)
     >>> from zope.interface import Interface, implements

=== modified file 'lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt'
--- lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt	2006-07-14 14:45:31 +0000
+++ lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt	2010-10-20 01:49:43 +0000
@@ -1,8 +1,8 @@
 We have a custom IUserPreferredCharsets which always returns
 utf-8 as the preferred charset.
 
+    >>> from zope.publisher.browser import TestRequest
     >>> from canonical.launchpad.webapp import Utf8PreferredCharsets
-    >>> from zope.publisher.browser import TestRequest
     >>> user_preferred = Utf8PreferredCharsets(TestRequest())
 
     >>> from zope.i18n.interfaces import IUserPreferredCharsets

=== modified file 'lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt'
--- lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt	2010-09-13 04:45:59 +0000
+++ lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt	2010-10-20 01:49:43 +0000
@@ -12,8 +12,8 @@
 since get_request_remaining_seconds will raise. However, if the user is logged
 in, a query will be issued to render the "Logged in as No Privileges Person".
 
+    >>> from canonical.config import config
     >>> from textwrap import dedent
-    >>> from canonical.config import config
     >>> test_data = dedent("""
     ...     [database]
     ...     db_statement_timeout: 10000

=== modified file 'lib/canonical/lazr/doc/menus.txt'
--- lib/canonical/lazr/doc/menus.txt	2010-09-28 19:10:51 +0000
+++ lib/canonical/lazr/doc/menus.txt	2010-10-20 01:49:43 +0000
@@ -76,8 +76,8 @@
     # objects. This function does most of the work, but views must be
     # assigned to the _last_obj_traversed attribute.
 
+    >>> from canonical.launchpad.webapp import canonical_url
     >>> from canonical.lazr.testing.menus import make_fake_request
-    >>> from canonical.launchpad.webapp import canonical_url
 
     >>> root = Root('', None)
     >>> cookbook = Cookbook('joy-of-cooking', root)
@@ -932,8 +932,8 @@
     >>> from zope.traversing.adapters import DefaultTraversable
     >>> from zope.traversing.interfaces import IPathAdapter, ITraversable
     >>> from canonical.launchpad.ftests import test_tales
+    >>> from canonical.lazr.testing.menus import summarise_tal_links
     >>> from lp.app.browser.tales import MenuAPI
-    >>> from canonical.lazr.testing.menus import summarise_tal_links
 
     # MenuAPI is normally registered as an IPathAdapter in ZCML. This
     # approximates what is done by the code:

=== modified file 'lib/canonical/lazr/doc/timeout.txt'
--- lib/canonical/lazr/doc/timeout.txt	2010-04-22 18:53:09 +0000
+++ lib/canonical/lazr/doc/timeout.txt	2010-10-20 01:49:43 +0000
@@ -10,8 +10,8 @@
 The time to wait can be passed using the timeout parameter to the
 decorator.
 
+    >>> from canonical.lazr.timeout import with_timeout
     >>> from select import select
-    >>> from canonical.lazr.timeout import with_timeout
 
     >>> @with_timeout(timeout=0.5)
     ... def wait_for(time):

=== modified file 'lib/lp/answers/browser/tests/views.txt'
--- lib/lp/answers/browser/tests/views.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/browser/tests/views.txt	2010-10-20 01:49:43 +0000
@@ -100,8 +100,8 @@
 
     # Setup a harness to easily test the view.
 
-    >>> from canonical.launchpad.ftests import LaunchpadFormHarness
     >>> from canonical.launchpad.browser import QuestionWorkflowView
+    >>> from canonical.launchpad.ftests import LaunchpadFormHarness
     >>> workflow_harness = LaunchpadFormHarness(
     ...     firefox_question, QuestionWorkflowView)
 
@@ -708,8 +708,8 @@
 retrieve the set of languages in which the user is assumed to be
 interested.
 
+    >>> from canonical.launchpad.browser import UserSupportLanguagesMixin
     >>> from canonical.launchpad.webapp import LaunchpadView
-    >>> from canonical.launchpad.browser import UserSupportLanguagesMixin
 
     >>> class UserSupportLanguagesView(UserSupportLanguagesMixin,
     ...                                LaunchpadView):

=== modified file 'lib/lp/answers/doc/emailinterface.txt.disabled'
--- lib/lp/answers/doc/emailinterface.txt.disabled	2010-10-04 19:50:45 +0000
+++ lib/lp/answers/doc/emailinterface.txt.disabled	2010-10-20 01:49:43 +0000
@@ -98,17 +98,17 @@
     # be the question owner and Sample Person who will play the role of
     # answer contact. Foo Bar is used to change the status of the
     # question.
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> login('[e-mail]')
     >>> personset = getUtility(IPersonSet)
     >>> sample_person = personset.getByEmail('[e-mail]')
     >>> no_priv = personset.getByEmail('[e-mail]')
     >>> foo_bar = personset.getByEmail('[e-mail]')
 
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from canonical.config import config
     >>> from canonical.database.sqlbase import commit
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']

=== modified file 'lib/lp/answers/doc/expiration.txt'
--- lib/lp/answers/doc/expiration.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/doc/expiration.txt	2010-10-20 01:49:43 +0000
@@ -19,8 +19,8 @@
 
     # Sanity check in case somebody modifies the question sampledata and
     # forget to update this script.
+    >>> from lp.answers.interfaces.questionenums import QuestionStatus
     >>> from lp.answers.model.question import Question
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
     >>> Question.select('status IN (%i,%i)' % (
     ...     QuestionStatus.OPEN.value,
     ...     QuestionStatus.NEEDSINFO.value)).count()
@@ -43,8 +43,8 @@
     >>> two_weeks_ago = now - timedelta(days=14)
     >>> a_month_ago = now - timedelta(days=31)
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.answers.interfaces.questioncollection import IQuestionSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.answers.interfaces.questioncollection import IQuestionSet
     >>> login('[e-mail]')
     >>> no_priv = getUtility(ILaunchBag).user
 

=== modified file 'lib/lp/answers/doc/faq-vocabulary.txt'
--- lib/lp/answers/doc/faq-vocabulary.txt	2010-08-02 02:33:53 +0000
+++ lib/lp/answers/doc/faq-vocabulary.txt	2010-10-20 01:49:43 +0000
@@ -4,10 +4,10 @@
 collection. It provides the IHugeVocabulary interface.
 
     >>> from zope.component import getUtility
-    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from zope.schema.vocabulary import getVocabularyRegistry
     >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from canonical.launchpad.webapp.vocabulary import IHugeVocabulary
-    >>> from zope.schema.vocabulary import getVocabularyRegistry
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> vocabulary_registry = getVocabularyRegistry()
     >>> firefox = getUtility(IProductSet).getByName('firefox')

=== modified file 'lib/lp/answers/doc/faq.txt'
--- lib/lp/answers/doc/faq.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/doc/faq.txt	2010-10-20 01:49:43 +0000
@@ -10,12 +10,12 @@
 are associated to distributions or products. The IFAQTarget interface is
 provided by objects that can host FAQs.
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from zope.security.proxy import removeSecurityProxy
 
+    >>> from lp.answers.interfaces.faqtarget import IFAQTarget
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.answers.interfaces.faqtarget import IFAQTarget
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
 

=== modified file 'lib/lp/answers/doc/faqtarget.txt'
--- lib/lp/answers/doc/faqtarget.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/answers/doc/faqtarget.txt	2010-10-20 01:49:43 +0000
@@ -31,8 +31,8 @@
 the target.
 
     >>> login('[e-mail]')
-    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> from canonical.launchpad.webapp.authorization import check_permission
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> check_permission('launchpad.Append', target)
     False
 

=== modified file 'lib/lp/answers/doc/notifications.txt'
--- lib/lp/answers/doc/notifications.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/doc/notifications.txt	2010-10-20 01:49:43 +0000
@@ -83,8 +83,8 @@
 Register the Ubuntu Team as Ubuntu's answer contact, so that they get
 notified about the changes as well:
 
-    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> ubuntu_team = getUtility(IPersonSet).getByName('ubuntu-team')
     >>> ubuntu_team.addLanguage(getUtility(ILanguageSet)['en'])
     >>> ubuntu.addAnswerContact(ubuntu_team)
@@ -103,9 +103,9 @@
 If we edit the title and description of the question, a notification
 will be sent.
 
+    >>> from zope.interface import providedBy
     >>> from lazr.lifecycle.event import ObjectModifiedEvent
     >>> from lazr.lifecycle.snapshot import Snapshot
-    >>> from zope.interface import providedBy
 
     >>> login('[e-mail]')
     >>> no_priv = getUtility(ILaunchBag).user

=== modified file 'lib/lp/answers/doc/person.txt'
--- lib/lp/answers/doc/person.txt	2010-06-09 17:07:49 +0000
+++ lib/lp/answers/doc/person.txt	2010-10-20 01:49:43 +0000
@@ -14,8 +14,8 @@
 commented on, or answered.  Various subsets can be selected by using the
 various search criteria.
 
+    >>> from lp.answers.interfaces.questionsperson import IQuestionsPerson
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.answers.interfaces.questionsperson import IQuestionsPerson
     >>> personset = getUtility(IPersonSet)
     >>> foo_bar_raw = personset.getByEmail('[e-mail]')
     >>> foo_bar = IQuestionsPerson(foo_bar_raw)

=== modified file 'lib/lp/answers/doc/projectgroup.txt'
--- lib/lp/answers/doc/projectgroup.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/doc/projectgroup.txt	2010-10-20 01:49:43 +0000
@@ -24,8 +24,8 @@
 You can search for all questions filed against projects in a project using the
 project group's searchQuestions() method.
 
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> login('[e-mail]')
     >>> thunderbird = getUtility(IProductSet).getByName('thunderbird')

=== modified file 'lib/lp/answers/doc/question.txt'
--- lib/lp/answers/doc/question.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/answers/doc/question.txt	2010-10-20 01:49:43 +0000
@@ -11,9 +11,9 @@
     >>> login('[e-mail]')
 
     >>> from canonical.launchpad.webapp.testing import verifyObject
+    >>> from lp.answers.interfaces.questiontarget import IQuestionTarget
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
-    >>> from lp.answers.interfaces.questiontarget import IQuestionTarget
     >>> from lp.registry.interfaces.product import IProductSet
 
     >>> firefox = getUtility(IProductSet)['firefox']
@@ -86,8 +86,8 @@
 
 Questions are manipulated through the IQuestion interface.
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.answers.interfaces.question import IQuestion
-    >>> from zope.security.proxy import removeSecurityProxy
 
     # The complete interface is not necessarily available to the
     # logged in user.

=== modified file 'lib/lp/answers/doc/questionsets.txt'
--- lib/lp/answers/doc/questionsets.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/answers/doc/questionsets.txt	2010-10-20 01:49:43 +0000
@@ -177,10 +177,10 @@
 
 Then some recent questions are created on a number of projects.
 
+    >>> from lp.answers.testing import QuestionFactory
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.answers.testing import QuestionFactory
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> landscape = getUtility(IProductSet).getByName('landscape')

=== modified file 'lib/lp/answers/doc/questiontarget.txt'
--- lib/lp/answers/doc/questiontarget.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/answers/doc/questiontarget.txt	2010-10-20 01:49:43 +0000
@@ -532,9 +532,9 @@
 copied to the question.
 
     >>> from datetime import datetime
-    >>> from pytz import UTC
     >>> from lp.bugs.interfaces.bug import CreateBugParams
     >>> from lp.registry.interfaces.product import IProductSet
+    >>> from pytz import UTC
 
     >>> now = datetime.now(UTC)
     >>> target = getUtility(IProductSet)['jokosher']

=== modified file 'lib/lp/answers/doc/workflow.txt'
--- lib/lp/answers/doc/workflow.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/answers/doc/workflow.txt	2010-10-20 01:49:43 +0000
@@ -602,8 +602,8 @@
     # Register an event listener that will print events it receives.
     >>> from lazr.lifecycle.interfaces import (
     ...     IObjectCreatedEvent, IObjectModifiedEvent)
+    >>> from canonical.lazr.testing.event import TestEventListener
     >>> from lp.answers.interfaces.question import IQuestion
-    >>> from canonical.lazr.testing.event import TestEventListener
 
     >>> def print_event(object, event):
     ...     print "Received %s on %s" % (

=== modified file 'lib/lp/answers/stories/distribution-package-answer-contact.txt'
--- lib/lp/answers/stories/distribution-package-answer-contact.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/stories/distribution-package-answer-contact.txt	2010-10-20 01:49:43 +0000
@@ -7,10 +7,10 @@
     # Register a Sample Person as an answer contact for the distribution.
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.services.worlddata.interfaces.language import ILanguageSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
-    >>> from canonical.database.sqlbase import flush_database_updates
     >>> login('[e-mail]')
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> # Answer contacts must speak a language

=== modified file 'lib/lp/answers/tests/questiontarget-sourcepackage.txt'
--- lib/lp/answers/tests/questiontarget-sourcepackage.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/answers/tests/questiontarget-sourcepackage.txt	2010-10-20 01:49:43 +0000
@@ -13,8 +13,8 @@
 of the DistributionSourcePackage (and not the SourcePackage):
 
     >>> login('[e-mail]')
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> firefox = ubuntu.currentseries.getSourcePackage('mozilla-firefox')
 

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2010-09-29 03:26:01 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2010-10-20 01:49:43 +0000
@@ -10,9 +10,9 @@
 in the root element of the page template. The base layout template uses the
 YUI grid classes for positioning.
 
-    >>> from z3c.ptcompat import ViewPageTemplateFile
     >>> from canonical.launchpad.webapp.publisher import LaunchpadView
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from z3c.ptcompat import ViewPageTemplateFile
 
     >>> user = factory.makePerson(name='waffles')
     >>> request = LaunchpadTestRequest(

=== modified file 'lib/lp/app/browser/tests/launchpadform-view.txt'
--- lib/lp/app/browser/tests/launchpadform-view.txt	2010-06-22 17:12:23 +0000
+++ lib/lp/app/browser/tests/launchpadform-view.txt	2010-10-20 01:49:43 +0000
@@ -6,15 +6,15 @@
 widget rendering is wrapped with a <div> using the widget_class, which
 can be used for subordinate field indentation, for example.
 
-    >>> from z3c.ptcompat import ViewPageTemplateFile
     >>> from zope.app.form.browser import TextWidget
     >>> from zope.interface import Interface
     >>> from zope.schema import TextLine
     >>> from canonical.config import config
+    >>> from z3c.ptcompat import ViewPageTemplateFile
     >>> from canonical.launchpad.webapp.launchpadform import (
     ...     custom_widget, LaunchpadFormView)
+    >>> from canonical.launchpad.testing.pages import find_tags_by_class
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from canonical.launchpad.testing.pages import find_tags_by_class
 
     >>> class ITestSchema(Interface):
     ...     displayname = TextLine(title=u"Title")

=== modified file 'lib/lp/app/doc/tales.txt'
--- lib/lp/app/doc/tales.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/app/doc/tales.txt	2010-10-20 01:49:43 +0000
@@ -113,8 +113,8 @@
 
 And finally Copy archives.
 
+    >>> from lp.soyuz.enums import ArchivePurpose
     >>> from lp.soyuz.interfaces.archive import IArchiveSet
-    >>> from lp.soyuz.enums import ArchivePurpose
     >>> copy = getUtility(IArchiveSet).new(
     ...     owner=mark, purpose=ArchivePurpose.COPY,
     ...     distribution=ubuntu, name='rebuild')
@@ -197,8 +197,8 @@
 
 The 'building' build is 14x14:
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.buildmaster.enums import BuildStatus
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> removeSecurityProxy(build).status = BuildStatus.BUILDING
     >>> print test_tales("build/image:icon", build=build)
     <img width="14" height="14"...src="/@@/processing" />
@@ -1181,8 +1181,8 @@
 
 Test the 'fmt:url' namespace for canonical urls.
 
+    >>> from zope.interface import implements
     >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
-    >>> from zope.interface import implements
     >>> class ObjectThatHasUrl:
     ...     implements(ICanonicalUrlData)
     ...     path = 'bonobo/saki'

=== modified file 'lib/lp/app/stories/basics/xx-beta-testers-redirection.txt'
--- lib/lp/app/stories/basics/xx-beta-testers-redirection.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/app/stories/basics/xx-beta-testers-redirection.txt	2010-10-20 01:49:43 +0000
@@ -203,8 +203,8 @@
 Add Foo Bar to the beta team.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from canonical.launchpad.ftests import login, logout
     >>> login('[e-mail]')
     >>> foo_bar = getUtility(IPersonSet).getByName('name16')

=== modified file 'lib/lp/archivepublisher/tests/archive-signing.txt'
--- lib/lp/archivepublisher/tests/archive-signing.txt	2010-09-02 11:45:19 +0000
+++ lib/lp/archivepublisher/tests/archive-signing.txt	2010-10-20 01:49:43 +0000
@@ -32,8 +32,8 @@
 `IArchiveSet.getPPAsPendingSigningKey` allows call-sites to query for
 PPA pending signing key generation.
 
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.soyuz.interfaces.archive import IArchiveSet
-    >>> from lp.registry.interfaces.person import IPersonSet
 
 Only PPAs with at least one source publication are considered.
 

=== modified file 'lib/lp/archivepublisher/tests/publishing-meta-data-files.txt'
--- lib/lp/archivepublisher/tests/publishing-meta-data-files.txt	2010-08-24 13:47:37 +0000
+++ lib/lp/archivepublisher/tests/publishing-meta-data-files.txt	2010-10-20 01:49:43 +0000
@@ -11,12 +11,12 @@
 
     >>> from canonical.launchpad.interfaces.librarian import (
     ...     ILibraryFileAliasSet)
+    >>> from cStringIO import StringIO
     >>> from lp.archiveuploader.tests import mock_logger
     >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.soyuz.enums import PackageUploadCustomFormat
     >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
-    >>> from lp.soyuz.enums import PackageUploadCustomFormat
     >>> from lp.soyuz.model.queue import PackageUploadCustom
-    >>> from cStringIO import StringIO
 
     >>> bat = getUtility(IDistributionSet)['ubuntutest']['breezy-autotest']
     >>> ppa = factory.makeArchive(distribution=bat.distribution)

=== modified file 'lib/lp/archiveuploader/tests/nascentupload-announcements.txt'
--- lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-10-20 01:49:43 +0000
@@ -52,8 +52,9 @@
 distroseries so that we can upload to it. Also adjust 'changeslist'
 address and allow uploads to universe:
 
-  >>> from canonical.launchpad.interfaces import (
-  ...     SeriesStatus, IDistributionSet, ILibraryFileAliasSet)
+  >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
+  >>> from lp.registry.interfaces.distribution import IDistributionSet
+  >>> from lp.registry.interfaces.series import SeriesStatus
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> hoary = ubuntu['hoary']
   >>> hoary.status = SeriesStatus.DEVELOPMENT
@@ -249,10 +250,10 @@
 
 A PPA upload will contain the X-Launchpad-PPA header.
 
+  >>> from lp.registry.interfaces.distribution import IDistributionSet
+  >>> from lp.registry.interfaces.person import IPersonSet
   >>> from lp.soyuz.enums import ArchivePurpose
   >>> from lp.soyuz.interfaces.archive import IArchiveSet
-  >>> from lp.registry.interfaces.distribution import IDistributionSet
-  >>> from lp.registry.interfaces.person import IPersonSet
 
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> name16 = getUtility(IPersonSet).getByName('name16')

=== modified file 'lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt'
--- lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt	2010-10-20 01:49:43 +0000
@@ -32,8 +32,9 @@
 
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.interfaces import (
-    ...    IBugTaskSet, IDistributionSet, IPersonSet)
+    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> login('[e-mail]')
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
 

=== modified file 'lib/lp/archiveuploader/tests/nascentupload-packageset.txt'
--- lib/lp/archiveuploader/tests/nascentupload-packageset.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/archiveuploader/tests/nascentupload-packageset.txt	2010-10-20 01:49:43 +0000
@@ -4,11 +4,12 @@
     >>> from lp.archiveuploader.tests import (
     ...     datadir, getPolicy, mock_logger_quiet)
     >>> from canonical.database.sqlbase import commit
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
     >>> from lp.soyuz.enums import ArchivePermissionType
-    >>> from canonical.launchpad.interfaces import (
-    ...     IArchivePermissionSet, IPackagesetSet,
-    ...     IPersonSet, ISourcePackageNameSet)
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
+    >>> from lp.soyuz.interfaces.packageset import IPackagesetSet
 
     >>> insecure_policy = getPolicy(
     ...     name='insecure', distro='ubuntu', distroseries='hoary')

=== modified file 'lib/lp/archiveuploader/tests/nascentupload.txt'
--- lib/lp/archiveuploader/tests/nascentupload.txt	2010-10-19 09:00:29 +0000
+++ lib/lp/archiveuploader/tests/nascentupload.txt	2010-10-20 01:49:43 +0000
@@ -12,8 +12,8 @@
 For the purpose of this test, hoary needs to be an open (development)
 distroseries so that we can upload to it.
 
-  >>> from canonical.launchpad.interfaces import (
-  ...     SeriesStatus, IDistributionSet)
+  >>> from lp.registry.interfaces.distribution import IDistributionSet
+  >>> from lp.registry.interfaces.series import SeriesStatus
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> hoary = ubuntu['hoary']
   >>> hoary.status = SeriesStatus.DEVELOPMENT
@@ -740,8 +740,8 @@
   False
 
   >>> from canonical.launchpad.webapp.testing import verifyObject
-  >>> from canonical.launchpad.interfaces import (
-  ...    IGPGKey, IPersonSet)
+  >>> from lp.registry.interfaces.gpg import IGPGKey
+  >>> from lp.registry.interfaces.person import IPersonSet
 
   >>> verifyObject(IGPGKey, bar_ok.changes.dsc.signingkey)
   True
@@ -815,8 +815,8 @@
 
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
     >>> from lp.soyuz.enums import ArchivePermissionType
-    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
     >>> bar_name = getUtility(ISourcePackageNameSet).getOrCreateByName("bar")
     >>> discard = ArchivePermission(
     ...     archive=ubuntu.main_archive, person=name16,

=== modified file 'lib/lp/archiveuploader/tests/upload-karma.txt'
--- lib/lp/archiveuploader/tests/upload-karma.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/archiveuploader/tests/upload-karma.txt	2010-10-20 01:49:43 +0000
@@ -49,9 +49,9 @@
 
 Poke the queue entry so it looks like Foo Bar (name16) uploaded it:
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.registry.interfaces.gpg import IGPGKeySet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> name16 = getUtility(IPersonSet).getByName('name16')
     >>> key = getUtility(IGPGKeySet).getGPGKeysForPeople([name16])[0]
     >>> removeSecurityProxy(foo_src.queue_root).signing_key = key
@@ -83,9 +83,9 @@
 will generate another different karma event for the uploader.
 
     >>> from lp.archiveuploader.tests import getPolicy
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.soyuz.enums import ArchivePurpose
     >>> from lp.soyuz.interfaces.archive import IArchiveSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
     >>> name16_ppa = getUtility(IArchiveSet).new(
     ...     owner=name16, distribution=ubuntu, purpose=ArchivePurpose.PPA)

=== modified file 'lib/lp/archiveuploader/tests/uploadpolicy.txt'
--- lib/lp/archiveuploader/tests/uploadpolicy.txt	2010-10-06 11:46:51 +0000
+++ lib/lp/archiveuploader/tests/uploadpolicy.txt	2010-10-20 01:49:43 +0000
@@ -78,8 +78,8 @@
 approve an upload automatically (I.E. move it straight to ACCEPTED
 instead of UNAPPROVED)
 
-  >>> from canonical.launchpad.interfaces import (
-  ...     SeriesStatus, IDistributionSet)
+  >>> from lp.registry.interfaces.distribution import IDistributionSet
+  >>> from lp.registry.interfaces.series import SeriesStatus
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> hoary = ubuntu['hoary']
 

=== modified file 'lib/lp/blueprints/doc/spec-mail-exploder.txt'
--- lib/lp/blueprints/doc/spec-mail-exploder.txt	2010-10-12 14:03:44 +0000
+++ lib/lp/blueprints/doc/spec-mail-exploder.txt	2010-10-20 01:49:43 +0000
@@ -268,8 +268,8 @@
     ...     config.launchpad.specs_domain)
     >>> moin_change['Sender'] = '[e-mail]'
 
+    >>> from lp.services.mail.incoming import handleMail
     >>> from lp.services.mail.sendmail import sendmail
-    >>> from lp.services.mail.incoming import handleMail
     >>> sendmail(moin_change, bulk=False)
     '...'
 

=== modified file 'lib/lp/blueprints/doc/specgraph.txt'
--- lib/lp/blueprints/doc/specgraph.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/doc/specgraph.txt	2010-10-20 01:49:43 +0000
@@ -256,8 +256,8 @@
     >>> from zope.component import getMultiAdapter
     >>> from lp.blueprints.browser.specification import (
     ...     SpecificationTreeImageTag)
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> svg_support = firefox.getSpecification('svg-support')

=== modified file 'lib/lp/blueprints/doc/specification-branch.txt'
--- lib/lp/blueprints/doc/specification-branch.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/doc/specification-branch.txt	2010-10-20 01:49:43 +0000
@@ -14,8 +14,8 @@
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
+    >>> from lp.code.interfaces.branchlookup import IBranchLookup
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.code.interfaces.branchlookup import IBranchLookup
 
     >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
     >>> spec = ubuntu.getSpecification('media-integrity-check')

=== modified file 'lib/lp/blueprints/doc/specification-notifications.txt'
--- lib/lp/blueprints/doc/specification-notifications.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/doc/specification-notifications.txt	2010-10-20 01:49:43 +0000
@@ -8,8 +8,8 @@
 Changing the status:
 
     >>> from zope.component import getMultiAdapter
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
     >>> login('[e-mail]')
     >>> firefox = getUtility(IProductSet).getByName('firefox')

=== modified file 'lib/lp/blueprints/doc/specification.txt'
--- lib/lp/blueprints/doc/specification.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/doc/specification.txt	2010-10-20 01:49:43 +0000
@@ -117,9 +117,9 @@
 ISpecification.getDelta(). If there are no changes, None will be
 returned:
 
+    >>> from zope.interface import providedBy
+    >>> from lazr.lifecycle.snapshot import Snapshot
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from lazr.lifecycle.snapshot import Snapshot
-    >>> from zope.interface import providedBy
     >>> unmodified_spec = Snapshot(ubuspec, providing=providedBy(ubuspec))
     >>> ubuspec.getDelta(unmodified_spec, jdub) is None
     True

=== modified file 'lib/lp/blueprints/doc/sprint-agenda.txt'
--- lib/lp/blueprints/doc/sprint-agenda.txt	2009-07-24 12:55:03 +0000
+++ lib/lp/blueprints/doc/sprint-agenda.txt	2010-10-20 01:49:43 +0000
@@ -9,8 +9,8 @@
 First, lets get hold of some people, a product, a sprint and a spec.
 
     >>> from lp.blueprints.model.sprint import SprintSet
+    >>> from lp.registry.model.person import PersonSet
     >>> from lp.registry.model.product import ProductSet
-    >>> from lp.registry.model.person import PersonSet
     >>> upstream_firefox = ProductSet()['firefox']
     >>> canvas = upstream_firefox.getSpecification('canvas')
     >>> guacamole = SprintSet()['uds-guacamole']

=== modified file 'lib/lp/blueprints/doc/sprint-meeting-export.txt'
--- lib/lp/blueprints/doc/sprint-meeting-export.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/doc/sprint-meeting-export.txt	2010-10-20 01:49:43 +0000
@@ -13,10 +13,10 @@
     >>> from pytz import timezone
     >>> from zope.component import getUtility, getMultiAdapter
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.blueprints.browser.sprint import SprintMeetingExportView
+    >>> from lp.blueprints.interfaces.sprint import ISprintSet
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.blueprints.interfaces.sprint import ISprintSet
-    >>> from lp.blueprints.browser.sprint import SprintMeetingExportView
 
 Look up a few Launchpad objects to be used in the tests
 

=== modified file 'lib/lp/blueprints/doc/sprint.txt'
--- lib/lp/blueprints/doc/sprint.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/doc/sprint.txt	2010-10-20 01:49:43 +0000
@@ -4,8 +4,8 @@
 Sprints or meetings can be coordinated using Launchpad.
 
     >>> from zope.component import getUtility
+    >>> from lp.blueprints.interfaces.sprint import ISprintSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.blueprints.interfaces.sprint import ISprintSet
     >>> sprintset = getUtility(ISprintSet)
 
 To find a sprint by name, use:
@@ -15,9 +15,9 @@
 The major pillars, product, distribution and project, have some
 properties which give us the sprints relevant to them.
 
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> productset = getUtility(IProductSet)
     >>> projectset = getUtility(IProjectGroupSet)
@@ -156,8 +156,8 @@
 
 Inactive products are excluded from the listings.
 
-    >>> from lp.registry.interfaces.product import IProductSet
     >>> from canonical.launchpad.ftests import login
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> login("[e-mail]")

=== modified file 'lib/lp/blueprints/stories/sprints/20-sprint-registration.txt'
--- lib/lp/blueprints/stories/sprints/20-sprint-registration.txt	2010-07-30 12:56:27 +0000
+++ lib/lp/blueprints/stories/sprints/20-sprint-registration.txt	2010-10-20 01:49:43 +0000
@@ -157,9 +157,9 @@
 First, we add a couple of IRC nicknames for Carlos.
 
     >>> from canonical.launchpad.ftests import login, logout
+    >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.model.person import IrcID
-    >>> from zope.component import getUtility
     >>> login('[e-mail]')
     >>> carlos = getUtility(IPersonSet).getByName('carlos')
     >>> IrcID(person=carlos, network='freenode', nickname='carlos')

=== modified file 'lib/lp/bugs/browser/tests/bug-nomination-views.txt'
--- lib/lp/bugs/browser/tests/bug-nomination-views.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/browser/tests/bug-nomination-views.txt	2010-10-20 01:49:43 +0000
@@ -7,9 +7,9 @@
 
     >>> from zope.component import getUtility, getMultiAdapter
 
-    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
     >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
 
     >>> login("[e-mail]")
 

=== modified file 'lib/lp/bugs/browser/tests/bug-views.txt'
--- lib/lp/bugs/browser/tests/bug-views.txt	2010-10-14 18:42:19 +0000
+++ lib/lp/bugs/browser/tests/bug-views.txt	2010-10-20 01:49:43 +0000
@@ -27,10 +27,19 @@
 comment, of the bug report.
 
     >>> from zope.component import getMultiAdapter, getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskSearchParams, IDistributionSet, IBugSet, IBugTaskSet,
-    ...     ILaunchBag, IOpenLaunchBag, IPersonSet, IProductSet)
+    >>> from canonical.launchpad.webapp.interfaces import (
+    ...     ILaunchBag,
+    ...     IOpenLaunchBag,
+    ...     )
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskSearchParams,
+    ...     IBugTaskSet,
+    ...     )
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> launchbag = getUtility(IOpenLaunchBag)
     >>> login("[e-mail]")
@@ -444,8 +453,8 @@
 returned results, because an approved nomination will have created a
 task anyway.
 
+    >>> from lp.bugs.interfaces.bugnomination import IBugNomination
     >>> from lp.bugs.interfaces.bugtask import IBugTask
-    >>> from lp.bugs.interfaces.bugnomination import IBugNomination
 
     >>> def get_object_type(task_or_nomination):
     ...     if IBugTask.providedBy(task_or_nomination):

=== modified file 'lib/lp/bugs/browser/tests/buglinktarget-views.txt'
--- lib/lp/bugs/browser/tests/buglinktarget-views.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/browser/tests/buglinktarget-views.txt	2010-10-20 01:49:43 +0000
@@ -4,9 +4,10 @@
 
     >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugLinkTarget, IBugSet, ICveSet)
     >>> from lazr.lifecycle.event import ObjectModifiedEvent
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.buglink import IBugLinkTarget
+    >>> from lp.bugs.interfaces.cve import ICveSet
 
     >>> bugset = getUtility(IBugSet)
     >>> cve = getUtility(ICveSet)['2005-2730']

=== modified file 'lib/lp/bugs/browser/tests/bugs-views.txt'
--- lib/lp/bugs/browser/tests/bugs-views.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/browser/tests/bugs-views.txt	2010-10-20 01:49:43 +0000
@@ -4,9 +4,9 @@
 doesn't use its context for anything, so we don't have to supply one
 when creating it.
 
-    >>> from lp.bugs.browser.bug import MaloneView
     >>> from canonical.launchpad.systemhomes import MaloneApplication
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.bugs.browser.bug import MaloneView
     >>> bugs_view = MaloneView(MaloneApplication(), LaunchpadTestRequest())
     >>> bugs_view.initialize()
 
@@ -31,8 +31,8 @@
 in the future.
 
     >>> login('[e-mail]')
+    >>> from canonical.launchpad.ftests import syncUpdate
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.ftests import syncUpdate
     >>> bug_eight = getUtility(IBugSet).get(8)
     >>> len(bug_eight.bugtasks)
     1

=== modified file 'lib/lp/bugs/browser/tests/bugtask-adding-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-adding-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/browser/tests/bugtask-adding-views.txt	2010-10-20 01:49:43 +0000
@@ -97,8 +97,8 @@
 most likely to get added. Let's take a look how it works for packages,
 which can have packaging links that helps us choose the product.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     CreateBugParams, IDistributionSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> owner = getUtility(ILaunchBag).user
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> ubuntu_firefox = ubuntu.getSourcePackage('mozilla-firefox')
@@ -168,8 +168,8 @@
 event listener and register it:
 
     >>> from zope.interface import Interface
+    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> from lazr.lifecycle.interfaces import IObjectCreatedEvent
-    >>> from canonical.launchpad.ftests.event import TestEventListener
 
     >>> def on_created_event(object, event):
     ...     print "ObjectCreatedEvent: %r" % object

=== modified file 'lib/lp/bugs/browser/tests/bugtask-edit-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-edit-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/browser/tests/bugtask-edit-views.txt	2010-10-20 01:49:43 +0000
@@ -10,8 +10,8 @@
 Person:
 
     >>> from zope.component import getMultiAdapter
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> login('[e-mail]')
     >>> bug_nine = getUtility(IBugSet).get(9)
     >>> ubuntu_thunderbird_task = bug_nine.bugtasks[1]
@@ -83,8 +83,8 @@
 distribution task already has, an error message will occur. First,
 let's add an evolution (Ubuntu) task to bug two.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTaskSet, IDistributionSet)
+    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> bug_two = getUtility(IBugSet).get(2)
     >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
     >>> ubuntu_evolution = ubuntu.getSourcePackage('evolution')

=== modified file 'lib/lp/bugs/browser/tests/bugtask-search-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-search-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/browser/tests/bugtask-search-views.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 In the 'Bugs' facet of a distribution we can find a list of bugs
 reported in that distribution and simple and advanced search forms.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IOpenLaunchBag, IDistributionSet)
+    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> launchbag = getUtility(IOpenLaunchBag)
     >>> debian = getUtility(IDistributionSet).getByName('debian')
 
@@ -230,8 +230,8 @@
 And now we'll change the status of one of the bugtasks, but first we
 need to be logged in.
 
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.ftests import login
-    >>> from canonical.database.sqlbase import flush_database_updates
 
     >>> login("[e-mail]")
 

=== modified file 'lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt'
--- lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt	2010-10-20 01:49:43 +0000
@@ -5,9 +5,9 @@
 Simple searching is possible on the distro source package bug view page.
 
   >>> from zope.component import getMultiAdapter, getUtility
-  >>> from canonical.launchpad.interfaces import (
-  ...     IDistributionSet, ISourcePackageNameSet)
   >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+  >>> from lp.registry.interfaces.distribution import IDistributionSet
+  >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 
   >>> debian = getUtility(IDistributionSet).get(3)
   >>> mozilla_firefox = getUtility(ISourcePackageNameSet).get(1)

=== modified file 'lib/lp/bugs/browser/tests/person-bug-views.txt'
--- lib/lp/bugs/browser/tests/person-bug-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/browser/tests/person-bug-views.txt	2010-10-20 01:49:43 +0000
@@ -87,8 +87,8 @@
 Using the advanced form we can also query for closed bugs reported by someone.
 Let's first close a bug setting its status to 'Invalid'.
 
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.ftests import login
-    >>> from canonical.database.sqlbase import flush_database_updates
 
     >>> login("[e-mail]")
 

=== modified file 'lib/lp/bugs/doc/bug-change.txt'
--- lib/lp/bugs/doc/bug-change.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/doc/bug-change.txt	2010-10-20 01:49:43 +0000
@@ -3,10 +3,10 @@
 The base class for BugChanges doesn't actually implement anything.
 
     >>> import pytz
+    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from datetime import datetime
     >>> from lp.bugs.adapters.bugchange import BugChangeBase
     >>> from lp.bugs.interfaces.bugchange import IBugChange
-    >>> from canonical.launchpad.webapp.testing import verifyObject
 
     >>> from lp.testing.factory import LaunchpadObjectFactory
     >>> factory = LaunchpadObjectFactory()

=== modified file 'lib/lp/bugs/doc/bug-export.txt'
--- lib/lp/bugs/doc/bug-export.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/doc/bug-export.txt	2010-10-20 01:49:43 +0000
@@ -23,10 +23,11 @@
   ...     import xml.etree.cElementTree as ET
   ... except ImportError:
   ...     import cElementTree as ET
+  >>> from zope.component import getUtility
   >>> from cStringIO import StringIO
-  >>> from zope.component import getUtility
-  >>> from canonical.launchpad.interfaces import (
-  ...     IBugSet, IPersonSet, IProductSet)
+  >>> from lp.bugs.interfaces.bug import IBugSet
+  >>> from lp.registry.interfaces.person import IPersonSet
+  >>> from lp.registry.interfaces.product import IProductSet
   >>> from lp.bugs.scripts.bugexport import (
   ...     serialise_bugtask, export_bugtasks)
 

=== modified file 'lib/lp/bugs/doc/bug-nomination.txt'
--- lib/lp/bugs/doc/bug-nomination.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bug-nomination.txt	2010-10-20 01:49:43 +0000
@@ -6,9 +6,9 @@
 
     >>> from zope.component import getUtility
     >>> from zope.interface.verify import verifyClass
-    >>> from lp.bugs.model.bugnomination import BugNomination
     >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.bugs.interfaces.bugnomination import IBugNomination
+    >>> from lp.bugs.model.bugnomination import BugNomination
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
 

=== modified file 'lib/lp/bugs/doc/bug-private-by-default.txt'
--- lib/lp/bugs/doc/bug-private-by-default.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/doc/bug-private-by-default.txt	2010-10-20 01:49:43 +0000
@@ -4,8 +4,9 @@
 (this is enforced by a DB constraint).
 
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, CreateBugParams, IProductSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
     >>> name16 = getUtility(IPersonSet).get(16)

=== modified file 'lib/lp/bugs/doc/bug-reported-acknowledgement.txt'
--- lib/lp/bugs/doc/bug-reported-acknowledgement.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bug-reported-acknowledgement.txt	2010-10-20 01:49:43 +0000
@@ -7,8 +7,9 @@
 
     >>> login('[e-mail]')
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IProjectGroupSet, IProductSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
 
     >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
     >>> distribution_source_package = (

=== modified file 'lib/lp/bugs/doc/bug-reporting-guidelines.txt'
--- lib/lp/bugs/doc/bug-reporting-guidelines.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bug-reporting-guidelines.txt	2010-10-20 01:49:43 +0000
@@ -6,8 +6,9 @@
 
     >>> login('[e-mail]')
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IProjectGroupSet, IProductSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
 
     >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
     >>> distribution_source_package = (

=== modified file 'lib/lp/bugs/doc/bug-set-status.txt'
--- lib/lp/bugs/doc/bug-set-status.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bug-set-status.txt	2010-10-20 01:49:43 +0000
@@ -10,9 +10,9 @@
     >>> login('[e-mail]')
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     CreateBugParams, IProductSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> bug_params = CreateBugParams(
     ...     owner=no_priv, title='Sample bug', comment='This is a sample bug.')
     >>> firefox = getUtility(IProductSet).getByName('firefox')

=== modified file 'lib/lp/bugs/doc/bug-tags.txt'
--- lib/lp/bugs/doc/bug-tags.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/bug-tags.txt	2010-10-20 01:49:43 +0000
@@ -67,9 +67,9 @@
 To make it easy editing the tags as a space separated text string, we
 use BugTagsWidget.
 
-    >>> from lp.bugs.interfaces.bug import IBug
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from canonical.widgets.bug import BugTagsWidget
+    >>> from lp.bugs.interfaces.bug import IBug
     >>> bug_tags_field = IBug['tags'].bind(bug_one)
     >>> tag_field = bug_tags_field.value_type
     >>> request = LaunchpadTestRequest()
@@ -178,9 +178,9 @@
 
 We can search for bugs with some specific tag.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskSearchParams, IDistributionSet)
     >>> from canonical.launchpad.searchbuilder import all
+    >>> from lp.bugs.interfaces.bugtask import BugTaskSearchParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> svg_tasks = ubuntu.searchTasks(
     ...     BugTaskSearchParams(tag=all(u'svg'), user=None))

=== modified file 'lib/lp/bugs/doc/bug.txt'
--- lib/lp/bugs/doc/bug.txt	2010-08-30 05:19:46 +0000
+++ lib/lp/bugs/doc/bug.txt	2010-10-20 01:49:43 +0000
@@ -313,8 +313,8 @@
 Note that a search will return all public bugs, omitting bug 14 which is
 private:
 
+    >>> from canonical.launchpad.interfaces.lpstorm import IStore
     >>> from lp.bugs.model.bug import Bug
-    >>> from canonical.launchpad.interfaces.lpstorm import IStore
     >>> all_bugs = set(IStore(Bug).find(Bug).values(Bug.id))
 
     >>> def hidden_bugs():

=== modified file 'lib/lp/bugs/doc/bugactivity.txt'
--- lib/lp/bugs/doc/bugactivity.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugactivity.txt	2010-10-20 01:49:43 +0000
@@ -22,9 +22,13 @@
     >>> from zope.event import notify
     >>> from lazr.lifecycle.event import (
     ...     ObjectCreatedEvent, ObjectModifiedEvent)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IUpstreamBugTask, IDistroBugTask, IProductSet, IBugTaskSet)
     >>> from lazr.lifecycle.snapshot import Snapshot
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     IBugTaskSet,
+    ...     IDistroBugTask,
+    ...     IUpstreamBugTask,
+    ...     )
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> user = getUtility(ILaunchBag).user
 
 
@@ -67,8 +71,8 @@
 
     >>> from lazr.lifecycle.snapshot import Snapshot
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
-    >>> from canonical.launchpad.interfaces import (
-    ...     ISourcePackageNameSet, IDistributionSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
     >>> mozilla_firefox = getUtility(ISourcePackageNameSet)['mozilla-firefox']
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> source_package_assignment = getUtility(IBugTaskSet).createTask(

=== modified file 'lib/lp/bugs/doc/bugattachments.txt'
--- lib/lp/bugs/doc/bugattachments.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/doc/bugattachments.txt	2010-10-20 01:49:43 +0000
@@ -10,8 +10,10 @@
     >>> from canonical.launchpad.ftests import login
     >>> login("[e-mail]")
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugAttachment, IBugSet, IMessageSet, IPersonSet)
+    >>> from canonical.launchpad.interfaces.message import IMessageSet
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugattachment import IBugAttachment
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> bugset = getUtility(IBugSet)
     >>> bug_one = bugset.get(1)
     >>> bug_one.attachments.count()
@@ -382,8 +384,11 @@
 
 We can search for attachment of a specific types:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugAttachmentType, BugTaskSearchParams, IBugTaskSet)
+    >>> from lp.bugs.interfaces.bugattachment import BugAttachmentType
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskSearchParams,
+    ...     IBugTaskSet,
+    ...     )
     >>> bugtaskset = getUtility(IBugTaskSet)
     >>> attachmenttype = BugAttachmentType.UNSPECIFIED
     >>> params = BugTaskSearchParams(attachmenttype=attachmenttype, user=None)

=== modified file 'lib/lp/bugs/doc/bugcomment.txt'
--- lib/lp/bugs/doc/bugcomment.txt	2010-10-14 18:42:19 +0000
+++ lib/lp/bugs/doc/bugcomment.txt	2010-10-20 01:49:43 +0000
@@ -5,8 +5,8 @@
 independently.
 
     >>> from zope.component import getMultiAdapter
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
 
 == Handling of the bug's first comment ==

=== modified file 'lib/lp/bugs/doc/bugmessage-visibility.txt'
--- lib/lp/bugs/doc/bugmessage-visibility.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugmessage-visibility.txt	2010-10-20 01:49:43 +0000
@@ -6,8 +6,8 @@
 A bug message has a visible field, which is True by default.
 
     # Setup for creating a new message
+    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
-    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> bugmessageset = getUtility(IBugMessageSet)

=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
--- lib/lp/bugs/doc/bugnotification-email.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugnotification-email.txt	2010-10-20 01:49:43 +0000
@@ -28,9 +28,13 @@
 examples that follow:
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugDelta, IBugSet, IEmailAddressSet, IPersonSet)
+    >>> from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
     >>> from lp.bugs.adapters.bugdelta import BugDelta
+    >>> from lp.bugs.interfaces.bug import (
+    ...     IBugDelta,
+    ...     IBugSet,
+    ...     )
+    >>> from lp.registry.interfaces.person import IPersonSet
 
 = Filing a bug =
 
@@ -280,10 +284,13 @@
 
 We use a BugTaskDelta to represent changes to a BugTask.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskStatus, IBugTaskDelta, IBugTaskSet)
+    >>> from canonical.launchpad.webapp.testing import verifyObject
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskStatus,
+    ...     IBugTaskDelta,
+    ...     IBugTaskSet,
+    ...     )
     >>> from lp.bugs.model.bugtask import BugTaskDelta
-    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> example_bug_task = factory.makeBugTask()
     >>> example_delta = BugTaskDelta(example_bug_task)
     >>> verifyObject(IBugTaskDelta, example_delta)

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2010-10-20 01:49:43 +0000
@@ -54,8 +54,8 @@
 Anyway, let's start our demonstration by adding a comment to a bug:
 
     >>> login('[e-mail]')
+    >>> from canonical.launchpad.interfaces.message import IMessageSet
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.interfaces.message import IMessageSet
     >>> bug_one = getUtility(IBugSet).get(1)
     >>> sample_person = getUtility(ILaunchBag).user
     >>> comment = getUtility(IMessageSet).fromText(
@@ -374,8 +374,8 @@
 
 We will also need a fresh new bug.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, CreateBugParams)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> description = getUtility(IMessageSet).fromText(
     ...     'subject', 'a description of the bug.', sample_person,

=== modified file 'lib/lp/bugs/doc/bugnotification-threading.txt'
--- lib/lp/bugs/doc/bugnotification-threading.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/bugnotification-threading.txt	2010-10-20 01:49:43 +0000
@@ -9,8 +9,8 @@
 
 Let's add add change notification and see how it works:
 
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.database import MessageSet
-    >>> from canonical.database.sqlbase import flush_database_updates
 
     >>> login('[e-mail]')
 

=== modified file 'lib/lp/bugs/doc/bugnotificationrecipients.txt'
--- lib/lp/bugs/doc/bugnotificationrecipients.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugnotificationrecipients.txt	2010-10-20 01:49:43 +0000
@@ -11,16 +11,16 @@
 action:
 
   >>> from lp.bugs.model.bug import Bug
+  >>> from lp.registry.model.distribution import Distribution
   >>> from lp.registry.model.product import Product
-  >>> from lp.registry.model.distribution import Distribution
   >>> bug_one = Bug.get(1)
   >>> recipients = bug_one.getBugNotificationRecipients()
 
 The instance of BugNotificationRecipients we get back correctly
 implements INotificationRecipientSet:
 
+  >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
   >>> from canonical.launchpad.webapp.testing import verifyObject
-  >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
   >>> verifyObject(INotificationRecipientSet, recipients)
   True
 

=== modified file 'lib/lp/bugs/doc/bugnotifications.txt'
--- lib/lp/bugs/doc/bugnotifications.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/bugs/doc/bugnotifications.txt	2010-10-20 01:49:43 +0000
@@ -26,9 +26,12 @@
     >>> from zope.event import notify
     >>> from lazr.lifecycle.event import (
     ...     ObjectModifiedEvent, ObjectCreatedEvent)
-    >>> from canonical.launchpad.interfaces import (
-    ...     CreateBugParams, IDistributionSet, IDistroSeriesSet, IPersonSet,
-    ...     IProductSet, ISourcePackageNameSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 
     >>> bug_submitter = getUtility(IPersonSet).get(12)
     >>> firefox = getUtility(IProductSet).get(4)
@@ -51,8 +54,8 @@
 
 === Editing a bug report ===
 
+    >>> from lazr.lifecycle.snapshot import Snapshot
     >>> from lp.bugs.interfaces.bug import IBug
-    >>> from lazr.lifecycle.snapshot import Snapshot
     >>> bug_before_modification = Snapshot(firefox_crashes, providing=IBug)
     >>> firefox_crashes.description = "a new description"
     >>> firefox_crashes_modified = ObjectModifiedEvent(
@@ -207,9 +210,11 @@
 Let's demonstrate a notification email where Sample Person marks a
 task Fixed, and assigns himself to it.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskStatus, IDistroBugTask)
     >>> from lazr.lifecycle.snapshot import Snapshot
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskStatus,
+    ...     IDistroBugTask,
+    ...     )
 
     >>> bugtask_before_modification = Snapshot(
     ...     firefox_crashes_in_debian, providing=IDistroBugTask)

=== modified file 'lib/lp/bugs/doc/bugsubscription.txt'
--- lib/lp/bugs/doc/bugsubscription.txt	2010-10-15 14:26:57 +0000
+++ lib/lp/bugs/doc/bugsubscription.txt	2010-10-20 01:49:43 +0000
@@ -12,8 +12,8 @@
 
 IBug has a subscriptions attribute:
 
+    >>> from zope.component import getUtility
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from zope.component import getUtility
     >>> bugset = getUtility(IBugSet)
     >>> bug = bugset.get(1)
     >>> bug.subscriptions.count()
@@ -43,8 +43,10 @@
 Let's create a new bug to demonstrate how direct and indirect
 subscriptions work.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, ILaunchBag, IPersonSet, CreateBugParams)
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
     >>> personset = getUtility(IPersonSet)
 

=== modified file 'lib/lp/bugs/doc/bugtarget.txt'
--- lib/lp/bugs/doc/bugtarget.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/doc/bugtarget.txt	2010-10-20 01:49:43 +0000
@@ -12,8 +12,9 @@
 target (such as in filterable e-mail messages).
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTarget, IDistributionSet, IProductSet)
+    >>> from lp.bugs.interfaces.bugtarget import IBugTarget
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> distroset = getUtility(IDistributionSet)
     >>> debian = distroset.getByName("debian")
     >>> debian_firefox = debian.getSourcePackage("mozilla-firefox")

=== modified file 'lib/lp/bugs/doc/bugtask-bugwatch-widget.txt'
--- lib/lp/bugs/doc/bugtask-bugwatch-widget.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugtask-bugwatch-widget.txt	2010-10-20 01:49:43 +0000
@@ -19,8 +19,8 @@
 
 Now we can create a widget using a test request:
 
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from canonical.widgets.bugtask import BugTaskBugWatchWidget
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> request = LaunchpadTestRequest()
     >>> bugwatch_widget = BugTaskBugWatchWidget(
     ...     bugwatch_field, bugwatch_field.vocabulary, request)

=== modified file 'lib/lp/bugs/doc/bugtask-expiration.txt'
--- lib/lp/bugs/doc/bugtask-expiration.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugtask-expiration.txt	2010-10-20 01:49:43 +0000
@@ -31,9 +31,11 @@
 (min_days_old) that the bugtask has been in the unattended Incomplete
 status. It also requires specifying the user that is doing the search.
 
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskStatus,
+    ...     IBugTaskSet,
+    ...     )
     >>> from storm.store import Store
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskStatus, IBugTaskSet)
     >>> bugtaskset = getUtility(IBugTaskSet)
 
     >>> expirable_bugtasks = bugtaskset.findExpirableBugTasks()
@@ -64,8 +66,9 @@
 can_expire avoid an expensive db, in the case where we can easily tell
 that no bug tasks can be expired.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IPersonSet, IProductSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> jokosher = getUtility(IProductSet).getByName('jokosher')
     >>> sample_person = getUtility(IPersonSet).getByEmail(

=== modified file 'lib/lp/bugs/doc/bugtask-find-similar.txt'
--- lib/lp/bugs/doc/bugtask-find-similar.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugtask-find-similar.txt	2010-10-20 01:49:43 +0000
@@ -11,8 +11,9 @@
 It doesn't make much sense to find bugs similar to an empty string, so
 no results will be returned.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTaskSet, IPersonSet, IProductSet)
+    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> sample_person = getUtility(IPersonSet).getByEmail('[e-mail]')
     >>> similar_bugs = getUtility(IBugTaskSet).findSimilar(
@@ -80,8 +81,8 @@
 the Firefox bug to private, and repeat the search as a user who isn't
 allowed to view it, only the Thunderbird bug will be returned this time.
 
+    >>> from canonical.launchpad.ftests import syncUpdate
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.ftests import syncUpdate
     >>> login('[e-mail]')
     >>> firefox_svg_bug = getUtility(IBugSet).get(1)
     >>> firefox_svg_bug.setPrivate(True, getUtility(ILaunchBag).user)

=== modified file 'lib/lp/bugs/doc/bugtask-package-widget.txt'
--- lib/lp/bugs/doc/bugtask-package-widget.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/bugs/doc/bugtask-package-widget.txt	2010-10-20 01:49:43 +0000
@@ -12,9 +12,9 @@
 to map the package names, we need a distribution, so we give the widget
 a distribution task to work with.
 
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.bugs.interfaces.bugtask import IDistroBugTask
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
     >>> bug_one = getUtility(IBugSet).get(1)
     >>> ubuntu_task = bug_one.bugtasks[-2]
     >>> ubuntu_task.distribution.name

=== modified file 'lib/lp/bugs/doc/bugtask-retrieval.txt'
--- lib/lp/bugs/doc/bugtask-retrieval.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/doc/bugtask-retrieval.txt	2010-10-20 01:49:43 +0000
@@ -5,9 +5,11 @@
 implementation of IBugTaskSet, allowing retrieval of any bug task in
 Launchpad. We'll use this implementation for demonstration purposes:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTask, IBugTaskSet)
     >>> from lp.app.errors import NotFoundError
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     IBugTask,
+    ...     IBugTaskSet,
+    ...     )
     >>> task_set = getUtility(IBugTaskSet)
 
 

=== modified file 'lib/lp/bugs/doc/bugtask-search.txt'
--- lib/lp/bugs/doc/bugtask-search.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugtask-search.txt	2010-10-20 01:49:43 +0000
@@ -4,8 +4,10 @@
 method, but they all delegate the search to IBugTaskSet.search(). That
 method accepts a single parameter; an BugTaskSearchParams instance.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskSearchParams, IBugTaskSet)
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskSearchParams,
+    ...     IBugTaskSet,
+    ...     )
     >>> bugtask_set = getUtility(IBugTaskSet)
     >>> all_public = BugTaskSearchParams(user=None)
     >>> found_bugtasks = bugtask_set.search(all_public)
@@ -293,8 +295,10 @@
 
 Add an Ubuntu bugtask for a bug that is confirmed upstream.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskImportance, BugTaskStatus)
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskImportance,
+    ...     BugTaskStatus,
+    ...     )
     >>> from lp.bugs.tests.test_bugtask_1 import (
     ...     BugTaskSearchBugsElsewhereTest)
     >>> def bugTaskInfo(bugtask):
@@ -736,9 +740,12 @@
 It's possible to search for bugs with an attachment of a certain type.
 
     >>> from StringIO import StringIO
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugAttachmentType, IBugAttachmentSet, ILibraryFileAliasSet,
-    ...     IMessageSet)
+    >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
+    >>> from canonical.launchpad.interfaces.message import IMessageSet
+    >>> from lp.bugs.interfaces.bugattachment import (
+    ...     BugAttachmentType,
+    ...     IBugAttachmentSet,
+    ...     )
     >>> product = factory.makeProduct()
     >>> patch_bug = factory.makeBug(
     ...     product=product)

=== modified file 'lib/lp/bugs/doc/bugtask-status-workflow.txt'
--- lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-10-20 01:49:43 +0000
@@ -11,8 +11,9 @@
 a new bug to work with:
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, ILaunchBag, CreateBugParams)
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> login("[e-mail]")
     >>> foobar = getUtility(ILaunchBag).user

=== modified file 'lib/lp/bugs/doc/bugtask.txt'
--- lib/lp/bugs/doc/bugtask.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/bugs/doc/bugtask.txt	2010-10-20 01:49:43 +0000
@@ -41,8 +41,10 @@
 
 Next, we need to grab some values to provide for importance and status.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskImportance, BugTaskStatus)
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskImportance,
+    ...     BugTaskStatus,
+    ...     )
     >>> STATUS_NEW = BugTaskStatus.NEW
     >>> STATUS_CONFIRMED = BugTaskStatus.CONFIRMED
     >>> STATUS_FIXRELEASED = BugTaskStatus.FIXRELEASED
@@ -105,8 +107,8 @@
 
 == Bug Task Targets ==
 
+    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
     >>> from lp.registry.model.distributionsourcepackage import DistributionSourcePackage
-    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
 
 The "target" of an IBugTask can be one of the items in the following
 list.
@@ -165,8 +167,8 @@
 
   * a distroseries sourcepackage
 
+    >>> from lp.registry.interfaces.sourcepackage import ISourcePackage
     >>> from lp.registry.model.sourcepackage import SourcePackage
-    >>> from lp.registry.interfaces.sourcepackage import ISourcePackage
     >>> distro_series_sp_task = bugtaskset.get(16)
     >>> expected_target = SourcePackage(
     ...     distroseries=distro_series_sp_task.distroseries,
@@ -825,8 +827,8 @@
 later on the interaction between privacy and teams (see the section
 entitled _Privacy and Team Awareness_):
 
+    >>> from lazr.lifecycle.snapshot import Snapshot
     >>> from lp.bugs.interfaces.bug import IBug
-    >>> from lazr.lifecycle.snapshot import Snapshot
 
     >>> bug_upstream_firefox_no_svg_support = bugtaskset.get(2)
 

=== modified file 'lib/lp/bugs/doc/bugtracker.txt'
--- lib/lp/bugs/doc/bugtracker.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugtracker.txt	2010-10-20 01:49:43 +0000
@@ -139,8 +139,8 @@
 bugtracker it will use make_bugtracker_name() to generate a name for the
 bug tracker.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IPersonSet)
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> sample_person = getUtility(IPersonSet).getByEmail(
     ...     '[e-mail]')
     >>> a_bugtracker = bugtracker_set.ensureBugTracker(
@@ -325,8 +325,8 @@
 
 We will forge some BugMessage records before trying again:
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
-    >>> from zope.security.proxy import removeSecurityProxy
 
     >>> for num, bug_watch in enumerate(mozilla_bugzilla.watches):
     ...     bug_message = getUtility(IBugMessageSet).createMessage(

=== modified file 'lib/lp/bugs/doc/bugwatch.txt'
--- lib/lp/bugs/doc/bugwatch.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugwatch.txt	2010-10-20 01:49:43 +0000
@@ -59,8 +59,9 @@
 Watches of Email Address bugtrackers are slightly different: the `url`
 property is always the same as the bugtracker baseurl property.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IBugTrackerSet, IPersonSet)
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> bugtrackerset = getUtility(IBugTrackerSet)
 
     >>> email_bugtracker = bugtrackerset['email']
@@ -267,8 +268,8 @@
     ...         print "%s => %s" % (old_bugtask.importance.title,
     ...             bugtask.importance.title)
     >>> from canonical.launchpad.ftests.event import TestEventListener
+    >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
     >>> from lp.bugs.interfaces.bugtask import IBugTask
-    >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
     >>> event_listener = TestEventListener(
     ...     IBugTask, IObjectModifiedEvent, print_bugtask_modified)
 
@@ -417,9 +418,13 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates
-    >>> from canonical.launchpad.interfaces import (
-    ...     CreateBugParams, BugTrackerType, IBugTaskSet,
-    ...     IBugTrackerSet, IDistributionSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
+    >>> from lp.bugs.interfaces.bugtracker import (
+    ...     BugTrackerType,
+    ...     IBugTrackerSet,
+    ...     )
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> ubuntu = getUtility(IDistributionSet).get(1)
     >>> firefox = ubuntu.getSourcePackage('mozilla-firefox')
@@ -462,8 +467,8 @@
     >>> import transaction
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     TestRoundup)
+    >>> from canonical.launchpad.scripts.logger import FakeLogger
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.launchpad.scripts.logger import FakeLogger
     >>> bug_watch_updater = CheckwatchesMaster(transaction, FakeLogger())
     >>> external_bugtracker = TestRoundup(bug_tracker.baseurl)
     >>> bug_watch_updater.updateBugWatches(external_bugtracker, [bug_watch])
@@ -550,8 +555,8 @@
 next_check time for the watch will be in the past (or in this case is
 now) and therefore it will be checked with the next checkwatches run.
 
+    >>> from datetime import datetime
     >>> from pytz import utc
-    >>> from datetime import datetime
     >>> schedulable_watch.next_check = datetime.now(utc)
     >>> schedulable_watch.can_be_rescheduled
     False

=== modified file 'lib/lp/bugs/doc/bugwidget.txt'
--- lib/lp/bugs/doc/bugwidget.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugwidget.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 The BugWidget converts string bug ids to the corresponding bug object.
 
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from canonical.widgets.bug import BugWidget
     >>> from lp.services.fields import BugField
-    >>> from canonical.widgets.bug import BugWidget
     >>> bug_field = BugField(__name__='bug', title=u'Bug')
     >>> request = LaunchpadTestRequest(form={'field.bug': '1'})
     >>> bug_widget = BugWidget(bug_field, request)

=== modified file 'lib/lp/bugs/doc/bugzilla-import.txt'
--- lib/lp/bugs/doc/bugzilla-import.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/doc/bugzilla-import.txt	2010-10-20 01:49:43 +0000
@@ -106,9 +106,10 @@
 
   >>> from zope.component import getUtility
   >>> from canonical.launchpad.ftests import login
-  >>> from canonical.launchpad.interfaces import (
-  ...     IBugSet, ILaunchpadCelebrities, IPersonSet)
+  >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+  >>> from lp.bugs.interfaces.bug import IBugSet
   >>> from lp.bugs.scripts import bugzilla
+  >>> from lp.registry.interfaces.person import IPersonSet
 
 Get a reference to the Ubuntu bug tracker, and log in:
 

=== modified file 'lib/lp/bugs/doc/checkwatches-batching.txt'
--- lib/lp/bugs/doc/checkwatches-batching.txt	2010-04-21 10:30:24 +0000
+++ lib/lp/bugs/doc/checkwatches-batching.txt	2010-10-20 01:49:43 +0000
@@ -67,9 +67,9 @@
 For bug watches that have been checked before, the remote system is
 asked which of a list of bugs have been modified since a given date.
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from datetime import datetime
     >>> from pytz import UTC
-    >>> from zope.security.proxy import removeSecurityProxy
 
     >>> class QueryableRemoteSystem:
     ...     sync_comments = False

=== modified file 'lib/lp/bugs/doc/checkwatches-cli-switches.txt'
--- lib/lp/bugs/doc/checkwatches-cli-switches.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/doc/checkwatches-cli-switches.txt	2010-10-20 01:49:43 +0000
@@ -87,8 +87,8 @@
 
     >>> import pytz
     >>> from datetime import datetime
+    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
     >>> from lp.testing.factory import LaunchpadObjectFactory
-    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
 
     >>> factory = LaunchpadObjectFactory()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')

=== modified file 'lib/lp/bugs/doc/checkwatches.txt'
--- lib/lp/bugs/doc/checkwatches.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/checkwatches.txt	2010-10-20 01:49:43 +0000
@@ -20,8 +20,8 @@
 
     >>> from canonical.config import config
     >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.testing.factory import LaunchpadObjectFactory
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
 
@@ -104,14 +104,13 @@
 First, we create some bug watches to test with:
 
     >>> from datetime import datetime
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.model.bugtracker import BugTracker
     >>> from pytz import utc
-    >>> from lp.bugs.model.bugtracker import BugTracker
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IBugSet)
     >>> from lp.bugs.scripts.checkwatches import (
     ...     CheckwatchesMaster)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> sample_person = getUtility(IPersonSet).getByEmail(
     ...     '[e-mail]')
 
@@ -257,8 +256,8 @@
 batch size. We will also monkey-patch urllib2.urlopen again so that no
 requests are actually made.
 
-    >>> from lp.bugs import externalbugtracker
     >>> from canonical.launchpad.scripts import FakeLogger
+    >>> from lp.bugs import externalbugtracker
 
     >>> transaction.commit()
     >>> updater = CheckwatchesMaster(transaction.manager)

=== modified file 'lib/lp/bugs/doc/displaying-bugs-and-tasks.txt'
--- lib/lp/bugs/doc/displaying-bugs-and-tasks.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/displaying-bugs-and-tasks.txt	2010-10-20 01:49:43 +0000
@@ -16,8 +16,10 @@
   >>> from zope.component import getUtility
   >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
   >>> from lp.bugs.interfaces.bugtask import BugTaskImportance, IBugTaskSet
-  >>> from canonical.launchpad.ftests import test_tales
-  >>> from canonical.launchpad.ftests import login
+  >>> from canonical.launchpad.ftests import (
+  ...     login,
+  ...     test_tales,
+  ...     )
 
   >>> login("[e-mail]")
   >>> bugtaskset = getUtility(IBugTaskSet)
@@ -97,10 +99,10 @@
 We define a helper that uses the BugTaskListingView class (obtained via
 +listing-view) to render the status:
 
-  >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
-  >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
   >>> from zope.component import getMultiAdapter
+  >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
   >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+  >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
 
   >>> def render_bugtask_status(task):
   ...   view = getMultiAdapter(

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bug-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2010-10-20 01:49:43 +0000
@@ -24,8 +24,8 @@
     ...     def getBugTargetName(self, remote_bug):
     ...         return self._bugs[remote_bug]['package']
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IDistributionSet)
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
     >>> bugtracker = new_bugtracker(BugTrackerType.BUGZILLA)
@@ -45,8 +45,8 @@
 imported into, and the remote bug number. At the moment only
 distributions are supported as the bug target.
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> debian = getUtility(IDistributionSet).getByName('debian')
     >>> external_bugtracker._bugs['3'] =  {
     ...     'package': 'evolution',

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt	2010-10-15 20:45:24 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt	2010-10-20 01:49:43 +0000
@@ -386,8 +386,8 @@
 means that we can use it to import comments from the remote Bugzilla
 instance.
 
+    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
-    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> verifyObject(ISupportsCommentImport, bugzilla)
     True
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt	2010-10-20 01:49:43 +0000
@@ -334,8 +334,8 @@
 means that we can use it to import comments from the remote Bugzilla
 instance.
 
+    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
-    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> verifyObject(ISupportsCommentImport, bugzilla)
     True
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt	2010-10-20 01:49:43 +0000
@@ -14,9 +14,9 @@
 
     >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
     >>> from lp.bugs.tests.externalbugtracker import TestIssuezilla
-    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> txn = LaunchpadZopelessLayer.txn
     >>> mozilla_bugzilla = getUtility(IBugTrackerSet).getByName('mozilla.org')
     >>> issuezilla = TestIssuezilla(mozilla_bugzilla.baseurl)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-10-20 01:49:43 +0000
@@ -58,8 +58,8 @@
 Since we don't want to depend on a working network connection, we use a
 slightly modified implementation.
 
+    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
     >>> from lp.bugs.tests.externalbugtracker import TestBugzilla
-    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
     >>> gnome_bugzilla = (
     ...     getUtility(IBugTrackerSet).getByName('gnome-bugzilla'))
     >>> external_bugzilla = TestBugzilla(gnome_bugzilla.baseurl)
@@ -430,8 +430,9 @@
 
 Let's add a handful of watches:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IBugWatchSet, IPersonSet)
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> sample_person = getUtility(IPersonSet).getByEmail(
     ...     '[e-mail]')
     >>> bug_one = getUtility(IBugSet).get(1)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-10-20 01:49:43 +0000
@@ -10,10 +10,14 @@
     >>> from canonical.config import config
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, CreateBugParams, IBugMessageSet,
-    ...     IBugWatchSet, IMessageSet, IPersonSet, IProductSet)
+    >>> from canonical.launchpad.interfaces.message import IMessageSet
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> bug_tracker = new_bugtracker(BugTrackerType.BUGZILLA)
 
@@ -41,8 +45,7 @@
 
     >>> from lp.bugs.externalbugtracker import (
     ...     ExternalBugTracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     ISupportsCommentImport)
+    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
     >>> class CommentImportingExternalBugTracker(ExternalBugTracker):
     ...     implements(ISupportsCommentImport)
     ...

=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt'
--- lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt	2010-10-20 01:49:43 +0000
@@ -10,10 +10,14 @@
     >>> from canonical.config import config
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, CreateBugParams, IBugMessageSet,
-    ...     IBugWatchSet, IMessageSet, IPersonSet, IProductSet)
+    >>> from canonical.launchpad.interfaces.message import IMessageSet
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> bug_tracker = new_bugtracker(BugTrackerType.TRAC)
 
@@ -46,8 +50,7 @@
 an example ExternalBugTracker that implements the
 ISupportsCommentPushing interface.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ISupportsCommentPushing)
+    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentPushing
     >>> from lp.bugs.externalbugtracker import (
     ...     ExternalBugTracker)
 
@@ -187,8 +190,7 @@
 from the remote bugtracker. To demonstrate this, we need to create an
 example ExternalBugTracker that does comment importing.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ISupportsCommentImport)
+    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
     >>> class CommentImportingExternalBugTracker(
     ...     CommentPushingExternalBugTracker):
     ...     implements(ISupportsCommentImport)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-debbugs.txt'
--- lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2010-10-20 01:49:43 +0000
@@ -6,8 +6,8 @@
 test:
 
     >>> import os.path
+    >>> from canonical.config import config
     >>> from canonical.launchpad.components.ftests import __file__
-    >>> from canonical.config import config
     >>> test_db_location = os.path.join(
     ...     os.path.dirname(__file__), 'debbugs_db')
 
@@ -348,8 +348,8 @@
 
     >>> from lp.bugs.externalbugtracker import (
     ...     get_external_bugtracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, ISupportsCommentImport)
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
     >>> external_debbugs = get_external_bugtracker(
@@ -438,8 +438,10 @@
 Message. It requires a Person instance to be used as the Message's
 owner, so we'll turn Teun Vink into a Person.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, PersonCreationRationale)
+    >>> from lp.registry.interfaces.person import (
+    ...     IPersonSet,
+    ...     PersonCreationRationale,
+    ...     )
     >>> poster = getUtility(IPersonSet).ensurePerson(
     ...     poster_email, poster_name, PersonCreationRationale.BUGIMPORT,
     ...     comment='when importing comments for %s.' % bug_watch.title)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-emailaddress.txt'
--- lib/lp/bugs/doc/externalbugtracker-emailaddress.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-emailaddress.txt	2010-10-20 01:49:43 +0000
@@ -33,8 +33,11 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTracker, IBugTrackerSet, IPersonSet)
+    >>> from lp.bugs.interfaces.bugtracker import (
+    ...     IBugTracker,
+    ...     IBugTrackerSet,
+    ...     )
+    >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> sample_person = getUtility(IPersonSet).getByEmail(
     ...     '[e-mail]')

=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt'
--- lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt	2010-10-20 01:49:43 +0000
@@ -53,8 +53,8 @@
 
     >>> sample_person = getUtility(IPersonSet).getByEmail('[e-mail]')
 
+    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
     >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
-    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
     >>> example_bug_tracker = new_bugtracker(BugTrackerType.MANTIS)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis.txt'
--- lib/lp/bugs/doc/externalbugtracker-mantis.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-mantis.txt	2010-10-20 01:49:43 +0000
@@ -13,9 +13,9 @@
     >>> from lp.bugs.externalbugtracker import Mantis
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IExternalBugTracker)
     >>> from canonical.launchpad.webapp.testing import verifyObject
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
     >>> alsa_mantis = Mantis('http://example.com/')
 
     >>> verifyObject(IExternalBugTracker, alsa_mantis)
@@ -80,8 +80,8 @@
 
     >>> transaction.commit()
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> txn = LaunchpadZopelessLayer.txn
     >>> bug_watch_updater = CheckwatchesMaster(txn)
     >>> bug_watch_updater.updateBugWatches(

=== modified file 'lib/lp/bugs/doc/externalbugtracker-roundup.txt'
--- lib/lp/bugs/doc/externalbugtracker-roundup.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-roundup.txt	2010-10-20 01:49:43 +0000
@@ -11,8 +11,8 @@
 implements IExternalBugTracker.
 
     >>> from lp.bugs.externalbugtracker import Roundup
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IExternalBugTracker)
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
     >>> from canonical.launchpad.webapp.testing import verifyObject
@@ -138,8 +138,8 @@
 
     >>> transaction.commit()
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> txn = LaunchpadZopelessLayer.txn
     >>> bug_watch_updater = CheckwatchesMaster(txn)
     >>> roundup = TestRoundup(example_bug_tracker.baseurl)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-rt.txt'
--- lib/lp/bugs/doc/externalbugtracker-rt.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-rt.txt	2010-10-20 01:49:43 +0000
@@ -11,8 +11,8 @@
 
     >>> from lp.bugs.externalbugtracker import (
     ...     RequestTracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IExternalBugTracker)
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
     >>> from canonical.launchpad.webapp.testing import verifyObject
@@ -155,8 +155,9 @@
 First, we create some bug watches to test with. Example.com hosts an RT
 instance which has several bugs that we wish to watch:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IBugWatchSet, IPersonSet)
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     print_bugwatches)
 
@@ -180,8 +181,8 @@
 
     >>> transaction.commit()
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> txn = LaunchpadZopelessLayer.txn
     >>> bug_watch_updater = CheckwatchesMaster(txn)
     >>> rt = TestRequestTracker(example_bug_tracker.baseurl)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-sourceforge.txt'
--- lib/lp/bugs/doc/externalbugtracker-sourceforge.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-sourceforge.txt	2010-10-20 01:49:43 +0000
@@ -12,9 +12,9 @@
 
     >>> from lp.bugs.externalbugtracker import (
     ...     SourceForge)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IExternalBugTracker)
     >>> from canonical.launchpad.webapp.testing import verifyObject
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
     >>> verifyObject(IExternalBugTracker,
     ...     SourceForge('http://example.com'))
     True
@@ -161,8 +161,8 @@
 
     >>> transaction.commit()
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> txn = LaunchpadZopelessLayer.txn
     >>> bug_watch_updater = CheckwatchesMaster(txn)
     >>> sourceforge = TestSourceForge(example_bug_tracker.baseurl)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt'
--- lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt	2010-10-20 01:49:43 +0000
@@ -31,8 +31,8 @@
 
     >>> import random
     >>> from canonical.config import config
+    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
     >>> from canonical.launchpad.webapp.url import urlappend
-    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
 
     >>> class FakeResponse:
@@ -338,8 +338,10 @@
 We also need an example Bug, BugTracker and BugWatch.
 
     >>> from canonical.database.sqlbase import commit
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, CreateBugParams, IPersonSet, IProductSet)
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac.txt'
--- lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-10-20 01:49:43 +0000
@@ -13,9 +13,9 @@
     >>> from lp.bugs.externalbugtracker import Trac
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTrackerType, IExternalBugTracker)
     >>> from canonical.launchpad.webapp.testing import verifyObject
+    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
+    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
     >>> trac = Trac('http://example.com/')
     >>> verifyObject(IExternalBugTracker, trac)
     True
@@ -55,9 +55,9 @@
 a valid token, which is very unlikely), is that the broken Trac will
 not include a "trac_auth" cookie.
 
+    >>> from StringIO import StringIO
     >>> from httplib import HTTPMessage
     >>> from urllib import addinfourl
-    >>> from StringIO import StringIO
 
     >>> class TracReturning200ForPageNotFound(Trac):
     ...     def urlopen(self, url):
@@ -298,8 +298,8 @@
 
     >>> transaction.commit()
 
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
     >>> txn = LaunchpadZopelessLayer.txn
     >>> bug_watch_updater = CheckwatchesMaster(txn)
     >>> trac = TestTrac(example_bug_tracker.baseurl)

=== modified file 'lib/lp/bugs/doc/externalbugtracker.txt'
--- lib/lp/bugs/doc/externalbugtracker.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/externalbugtracker.txt	2010-10-20 01:49:43 +0000
@@ -433,9 +433,9 @@
 getModifiedRemoteBugs(). I.e., if we have a set of newly created bug
 watches, the getModifiedRemoteBugs() method won't be called.
 
-    >>> from lp.bugs.model.bugtracker import BugTracker
     >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+    >>> from lp.bugs.model.bugtracker import BugTracker
     >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> sample_person = getUtility(IPersonSet).getByEmail(

=== modified file 'lib/lp/bugs/doc/hasbugs.txt'
--- lib/lp/bugs/doc/hasbugs.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/bugs/doc/hasbugs.txt	2010-10-20 01:49:43 +0000
@@ -5,8 +5,8 @@
 between the object and some of the bug tasks connected to it, and allows
 searching through the list of bugs.
 
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from zope.component import getUtility
     >>> from lp.bugs.interfaces.bugtarget import IHasBugs
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> distroset = getUtility(IDistributionSet)
@@ -30,8 +30,11 @@
 
     >>> login("[e-mail]")
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskImportance, BugTaskStatus, IBugTaskSet)
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskImportance,
+    ...     BugTaskStatus,
+    ...     IBugTaskSet,
+    ...     )
 
     >>> bug_one_in_debian_firefox = getUtility(IBugTaskSet).get(4)
     >>> bug_two_in_debian_firefox = getUtility(IBugTaskSet).get(5)

=== modified file 'lib/lp/bugs/doc/initial-bug-contacts.txt'
--- lib/lp/bugs/doc/initial-bug-contacts.txt	2010-10-14 18:42:19 +0000
+++ lib/lp/bugs/doc/initial-bug-contacts.txt	2010-10-20 01:49:43 +0000
@@ -388,9 +388,9 @@
 The list of teams that a user may add to a package as a bug supervisor will
 only contain those teams of which the user is an administrator.
 
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> package = ubuntu.getSourcePackage('mozilla-firefox')

=== modified file 'lib/lp/bugs/doc/malone-karma.txt'
--- lib/lp/bugs/doc/malone-karma.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/bugs/doc/malone-karma.txt	2010-10-20 01:49:43 +0000
@@ -2,8 +2,10 @@
 import some stuff and define a function to help us make the
 documentation cleaner:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IDistributionSet, IKarmaActionSet, IPersonSet)
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.karma import IKarmaActionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> foo_bar = getUtility(IPersonSet).getByEmail('[e-mail]')
 
 Setup an event listener to help ensure karma is assigned when it should.
@@ -70,8 +72,10 @@
 
 Mark a bug task as fixed:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskStatus, IDistroBugTask)
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskStatus,
+    ...     IDistroBugTask,
+    ...     )
     >>> bugtask = bug.bugtasks[0]
     >>> old_bugtask = Snapshot(bugtask, providing=IDistroBugTask)
     >>> bugtask.transitionToStatus(

=== modified file 'lib/lp/bugs/doc/malone-xmlrpc.txt'
--- lib/lp/bugs/doc/malone-xmlrpc.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/malone-xmlrpc.txt	2010-10-20 01:49:43 +0000
@@ -46,8 +46,8 @@
 IObjectCreatedEvent is being published when a bug is reported through
 the XML-RPC interface.
 
+    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> from lazr.lifecycle.interfaces import IObjectCreatedEvent
-    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> from lp.bugs.interfaces.bug import IBug
 
     >>> def on_created_event(obj, event):
@@ -233,8 +233,10 @@
 for authentication with external bug trackers.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPrivateMaloneApplication, IPrivateApplication)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     IPrivateApplication,
+    ...     IPrivateMaloneApplication,
+    ...     )
     >>> from canonical.launchpad.webapp.testing import verifyObject
 
     >>> private_root = getUtility(IPrivateApplication)
@@ -245,9 +247,9 @@
 The API provides a single method, newBugTrackerToken(), which returns
 the ID of the new LoginToken.
 
+    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from canonical.launchpad.interfaces import (
-    ...     IExternalBugTrackerTokenAPI, ILoginTokenSet)
+    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTrackerTokenAPI
     >>> from lp.bugs.xmlrpc.bug import (
     ...     ExternalBugTrackerTokenAPI)
 

=== modified file 'lib/lp/bugs/doc/official-bug-tags.txt'
--- lib/lp/bugs/doc/official-bug-tags.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/official-bug-tags.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 Distributions and products can define official bug tags.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IProductSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from canonical.launchpad.webapp.interfaces import (
     ...     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
     >>> from lp.bugs.model.bugtarget import OfficialBugTag

=== modified file 'lib/lp/bugs/doc/security-teams.txt'
--- lib/lp/bugs/doc/security-teams.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/doc/security-teams.txt	2010-10-20 01:49:43 +0000
@@ -5,10 +5,10 @@
 a "security contact" on a Distribution or a Product.
 
     >>> from zope.component import getUtility
+    >>> from lp.bugs.interfaces.securitycontact import IHasSecurityContact
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.bugs.interfaces.securitycontact import IHasSecurityContact
 
     >>> personset = getUtility(IPersonSet)
     >>> productset = getUtility(IProductSet)
@@ -280,10 +280,10 @@
 When a bug becomes security-related, the security contacts for the pillars it
 affects are subscribed to it.
 
+    >>> from zope.event import notify
+    >>> from lazr.lifecycle.event import ObjectModifiedEvent
+    >>> from lazr.lifecycle.snapshot import Snapshot
     >>> from lp.bugs.interfaces.bug import IBug
-    >>> from zope.event import notify
-    >>> from lazr.lifecycle.event import ObjectModifiedEvent
-    >>> from lazr.lifecycle.snapshot import Snapshot
 
     >>> product = factory.makeProduct()
     >>> product.security_contact = factory.makePerson(

=== modified file 'lib/lp/bugs/doc/sourceforge-remote-products.txt'
--- lib/lp/bugs/doc/sourceforge-remote-products.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/doc/sourceforge-remote-products.txt	2010-10-20 01:49:43 +0000
@@ -21,8 +21,8 @@
 If we add a Product and link it to a SourceForge project,
 getSFLinkedProductsWithNoneRemoteProduct() will return it.
 
+    >>> from lp.testing.factory import LaunchpadObjectFactory
     >>> from transaction import commit
-    >>> from lp.testing.factory import LaunchpadObjectFactory
     >>> factory = LaunchpadObjectFactory()
 
     >>> product_1 = factory.makeProduct(name='my-first-product')

=== modified file 'lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt'
--- lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt	2010-10-04 20:46:55 +0000
+++ lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt	2010-10-20 01:49:43 +0000
@@ -1,10 +1,11 @@
 First, some setup. Find out what the latest [private] bug reported on
 Ubuntu evolution is, so we can avoid hardcoding its ID here:
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, BugTaskSearchParams, ILaunchBag,
-    ...     ISourcePackageNameSet)
     >>> from zope.component import getUtility
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.bugs.interfaces.bugtask import BugTaskSearchParams
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
     >>> from canonical.launchpad.ftests import login, logout
 
     >>> login("[e-mail]")

=== modified file 'lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt'
--- lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt	2010-10-15 14:26:57 +0000
+++ lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt	2010-10-20 01:49:43 +0000
@@ -101,8 +101,8 @@
 
 The tags portlet displays a mix of official and unofficial tags.
 
+    >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from zope.component import getUtility
     >>> login('[e-mail]')
     >>> firesocks = factory.makeProduct(name='firesocks')
     >>> firesocks_bugs_url = canonical_url(firesocks, rootsite='bugs')

=== modified file 'lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt'
--- lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2010-10-20 01:49:43 +0000
@@ -22,8 +22,8 @@
     >>> import StringIO
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout, syncUpdate
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> login("[e-mail]")
     >>> bug_11 = getUtility(IBugSet).get(11)
     >>> launchbag = getUtility(ILaunchBag)

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt	2010-10-20 01:49:43 +0000
@@ -12,9 +12,9 @@
     >>> from zope.component import getUtility
 
     >>> from canonical.launchpad.ftests import login, logout
+    >>> from canonical.launchpad.webapp.authorization import check_permission
     >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.registry.interfaces.distribution import IDistributionSet
-    >>> from canonical.launchpad.webapp.authorization import check_permission
 
     >>> login("[e-mail]")
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt'
--- lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt	2010-10-20 01:49:43 +0000
@@ -39,8 +39,9 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout, syncUpdate
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskStatus, IBugSet, ILaunchBag)
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
 
     >>> login("[e-mail]")
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt'
--- lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt	2010-10-20 01:49:43 +0000
@@ -9,8 +9,11 @@
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
     >>> import transaction
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskImportance, BugTaskStatus, ILaunchBag)
+    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskImportance,
+    ...     BugTaskStatus,
+    ...     )
     >>> login('[e-mail]')
     >>> bigfixer = factory.makeProduct(name='bigfixer')
     >>> for bug_x in range(1, 11):

=== modified file 'lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt'
--- lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt	2010-10-20 01:49:43 +0000
@@ -104,9 +104,9 @@
 detailing the amount of time that has passed since the bug's expiration
 date. We alter the date_last_updated field of bug 11 to demonstrate this.
 
-    >>> from datetime import timedelta
     >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates
+    >>> from datetime import timedelta
     >>> from canonical.launchpad.ftests import login, logout
     >>> from lp.bugs.interfaces.bug import IBugSet
     >>> login('[e-mail]')

=== modified file 'lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt'
--- lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt	2010-10-08 12:06:55 +0000
+++ lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt	2010-10-20 01:49:43 +0000
@@ -55,8 +55,8 @@
     >>> print ff_bugtask.bug.id
     4
 
+    >>> from lp.registry.interfaces.milestone import IMilestoneSet
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.registry.interfaces.milestone import IMilestoneSet
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> ff_milestone = getUtility(IMilestoneSet).getByNameAndProduct(
     ...     "1.0", firefox)

=== modified file 'lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt'
--- lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt	2010-10-14 18:42:19 +0000
+++ lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt	2010-10-20 01:49:43 +0000
@@ -72,9 +72,9 @@
 the 'awaiting synchronization' mark goes away.
 
     >>> from zope.component import getUtility
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
-    >>> from canonical.database.sqlbase import flush_database_updates
     >>> login('[e-mail]')
     >>> bug_15 = getUtility(IBugSet).get(15)
     >>> message = bug_15.messages[-1]

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt	2010-10-20 01:49:43 +0000
@@ -23,8 +23,9 @@
     >>> from zope.component import getUtility
 
     >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, IProductSet, IDistributionSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> login("[e-mail]")
 

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-10-06 18:27:57 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-10-20 01:49:43 +0000
@@ -233,10 +233,11 @@
 Patches also appear as badges in bug listings.
 
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IMessageSet, IPersonSet)
     >>> from zope.component import getUtility
     >>> from StringIO import StringIO
+    >>> from canonical.launchpad.interfaces.message import IMessageSet
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> import transaction
     >>> login("[e-mail]")
     >>> foobar = getUtility(IPersonSet).getByName("name16")

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt	2010-10-20 01:49:43 +0000
@@ -7,9 +7,10 @@
 
 First, we create some bugs.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, IProductSet, CreateBugParams)
     >>> from zope.component import getUtility
+    >>> from lp.bugs.interfaces.bug import CreateBugParams
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from canonical.launchpad.ftests import login, logout
 
     >>> login("[e-mail]")

=== modified file 'lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt'
--- lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-08-26 14:57:11 +0000
+++ lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-10-20 01:49:43 +0000
@@ -60,9 +60,9 @@
 If we change the next_check date of the watch its will be shown in the
 Next check column.
 
+    >>> from zope.component import getUtility
     >>> from datetime import datetime
     >>> from pytz import utc
-    >>> from zope.component import getUtility
 
     >>> from canonical.launchpad.ftests import login, logout
     >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet

=== modified file 'lib/lp/bugs/stories/cve/cve-linking.txt'
--- lib/lp/bugs/stories/cve/cve-linking.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/bugs/stories/cve/cve-linking.txt	2010-10-20 01:49:43 +0000
@@ -109,9 +109,9 @@
     # This should use a private bug in our sample data.
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.database.sqlbase import flush_database_updates
     >>> login('[e-mail]')
     >>> private_bug = getUtility(IBugSet).get(6)
     >>> current_user = getUtility(ILaunchBag).user

=== modified file 'lib/lp/bugs/stories/feeds/xx-bug-atom.txt'
--- lib/lp/bugs/stories/feeds/xx-bug-atom.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/stories/feeds/xx-bug-atom.txt	2010-10-20 01:49:43 +0000
@@ -338,8 +338,8 @@
 This feed gets the latest bugs for a whole team.
 First, make a team responsible for some bugs.
 
+    >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from zope.component import getUtility
     >>> one_mem_browser = setupBrowser(
     ...    auth='Basic [e-mail]:test')
     >>> personset = getUtility(IPersonSet)

=== modified file 'lib/lp/bugs/stories/feeds/xx-bug-html.txt'
--- lib/lp/bugs/stories/feeds/xx-bug-html.txt	2009-10-13 19:51:20 +0000
+++ lib/lp/bugs/stories/feeds/xx-bug-html.txt	2010-10-20 01:49:43 +0000
@@ -4,8 +4,10 @@
 The content of an HTML feed is very similar to an Atom feed, but is formatted
 as HTML instead of Atom.
 
-    >>> from BeautifulSoup import BeautifulSoup
-    >>> from BeautifulSoup import SoupStrainer
+    >>> from BeautifulSoup import (
+    ...     BeautifulSoup,
+    ...     SoupStrainer,
+    ...     )
 
 Define a helper function for parsing the entries:
 

=== modified file 'lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt'
--- lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2010-10-06 18:53:53 +0000
+++ lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2010-10-20 01:49:43 +0000
@@ -74,8 +74,8 @@
 Firstly, we appoint Sample Person as the driver for the distribution.
 
     >>> from canonical.database.sqlbase import flush_database_updates
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IPersonSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from canonical.launchpad.ftests import login, logout
     >>> from zope.component import getUtility
     >>> login('[e-mail]')

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-09-20 19:23:08 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-10-20 01:49:43 +0000
@@ -116,8 +116,8 @@
 Activity is recorded and notifications are sent for newly created
 bugs.
 
+    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from lp.bugs.model.bugnotification import BugNotification
-    >>> from lp.bugs.interfaces.bug import IBugSet
     >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
     >>> from zope.component import getUtility
 

=== modified file 'lib/lp/bugs/tests/buglinktarget.txt'
--- lib/lp/bugs/tests/buglinktarget.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/tests/buglinktarget.txt	2010-10-20 01:49:43 +0000
@@ -16,8 +16,11 @@
     # to a registered user.
     >>> login('[e-mail]')
     >>> from zope.interface.verify import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugLinkTarget, IBugLink, IBugSet)
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.bugs.interfaces.buglink import (
+    ...     IBugLink,
+    ...     IBugLinkTarget,
+    ...     )
 
     >>> verifyObject(IBugLinkTarget, target)
     True

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2010-10-20 01:49:43 +0000
@@ -339,8 +339,7 @@
 will provide IWeaklyAuthenticatedPrincipal. Let's mark the current
 principal with that.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IWeaklyAuthenticatedPrincipal)
+    >>> from canonical.launchpad.interfaces.mail import IWeaklyAuthenticatedPrincipal
     >>> from zope.interface import directlyProvides, directlyProvidedBy
     >>> from zope.security.management import queryInteraction
     >>> participations = queryInteraction().participations
@@ -1222,8 +1221,8 @@
 bugs directly to series.
 
     >>> from canonical.config import config
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     # The script's default user doesn't have permission to change the driver.
     >>> commit()
@@ -1648,8 +1647,8 @@
 The user is a package bug supervisor
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, ISourcePackageNameSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
@@ -2880,8 +2879,8 @@
     >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
     >>> from lp.bugs.tests.externalbugtracker import (
     ...     new_bugtracker)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugWatchSet, IProductSet)
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+    >>> from lp.registry.interfaces.product import IProductSet
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')

=== modified file 'lib/lp/bugs/tests/bugtarget-questiontarget.txt'
--- lib/lp/bugs/tests/bugtarget-questiontarget.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/tests/bugtarget-questiontarget.txt	2010-10-20 01:49:43 +0000
@@ -13,8 +13,8 @@
 Product, Distribution, ProductSeries, DistributionSeries,
 SourcePackage, or DistributionSourcePackages.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTarget, IQuestionTarget)
+    >>> from lp.answers.interfaces.questiontarget import IQuestionTarget
+    >>> from lp.bugs.interfaces.bugtarget import IBugTarget
 
     >>> login('[e-mail]')
     >>> IBugTarget.providedBy(bugtarget)
@@ -177,8 +177,9 @@
     >>> big_bug = filebug(
     ...     bugtarget, "Print is borked", status=BugTaskStatus.NEW)
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugTaskSet, IDistributionSet, ISourcePackageNameSet)
+    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
     >>> evo_ubuntu = getUtility(ISourcePackageNameSet)['evolution']

=== modified file 'lib/lp/code/doc/branch-merge-proposal-notifications.txt'
--- lib/lp/code/doc/branch-merge-proposal-notifications.txt	2010-05-27 02:04:21 +0000
+++ lib/lp/code/doc/branch-merge-proposal-notifications.txt	2010-10-20 01:49:43 +0000
@@ -9,8 +9,8 @@
 When subscribers subscribe to branches, they can specify what level of
 notification they would like to receive.
 
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from difflib import unified_diff
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.code.enums import (
     ...     BranchSubscriptionDiffSize, BranchSubscriptionNotificationLevel,
     ...     CodeReviewNotificationLevel)

=== modified file 'lib/lp/code/doc/branch-visibility.txt'
--- lib/lp/code/doc/branch-visibility.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/code/doc/branch-visibility.txt	2010-10-20 01:49:43 +0000
@@ -60,8 +60,8 @@
 AccessBranch authorization class is used to authorize users for the
 combination of the launchpad.View permission and the IBranch interface.
 
+    >>> from zope.component import getAdapter
     >>> from canonical.launchpad.webapp.interfaces import IAuthorization
-    >>> from zope.component import getAdapter
     >>> getAdapter(branch, IAuthorization, name='launchpad.View')
     <canonical.launchpad.security.AccessBranch ...>
 

=== modified file 'lib/lp/code/doc/codeimport-event.txt'
--- lib/lp/code/doc/codeimport-event.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/code/doc/codeimport-event.txt	2010-10-20 01:49:43 +0000
@@ -19,8 +19,8 @@
 ICodeImportEventSet utility.
 
     >>> from zope.component import getUtility
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.code.interfaces.codeimportevent import ICodeImportEventSet
     >>> event_set = getUtility(ICodeImportEventSet)
     >>> verifyObject(ICodeImportEventSet, removeSecurityProxy(event_set))

=== modified file 'lib/lp/code/doc/codeimport-job.txt'
--- lib/lp/code/doc/codeimport-job.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/code/doc/codeimport-job.txt	2010-10-20 01:49:43 +0000
@@ -49,8 +49,8 @@
 
 There are two CodeImport objects of interest in the sample data.
 
-    >>> from lp.code.interfaces.codeimport import ICodeImportSet
     >>> from lp.code.interfaces.branchlookup import IBranchLookup
+    >>> from lp.code.interfaces.codeimport import ICodeImportSet
     >>> branch_lookup = getUtility(IBranchLookup)
     >>> code_import_set = getUtility(ICodeImportSet)
 

=== modified file 'lib/lp/code/doc/codeimport.txt'
--- lib/lp/code/doc/codeimport.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/code/doc/codeimport.txt	2010-10-20 01:49:43 +0000
@@ -23,9 +23,9 @@
 
     >>> from lp.code.interfaces.branchtarget import IBranchTarget
     >>> from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
-    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from zope.component import getUtility
     >>> from zope.security.proxy import removeSecurityProxy
+    >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> code_import_set = getUtility(ICodeImportSet)
     >>> verifyObject(ICodeImportSet, removeSecurityProxy(code_import_set))
     True
@@ -341,8 +341,8 @@
 There is a separate default update interval for each version control system,
 set in the Launchpad configuration system.
 
+    >>> from canonical.config import config
     >>> from datetime import timedelta
-    >>> from canonical.config import config
     >>> default_interval_cvs = timedelta(
     ...     seconds=config.codeimport.default_interval_cvs)
     >>> default_interval_subversion = timedelta(

=== modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt'
--- lib/lp/code/stories/branches/xx-branch-deletion.txt	2010-09-28 19:25:54 +0000
+++ lib/lp/code/stories/branches/xx-branch-deletion.txt	2010-10-20 01:49:43 +0000
@@ -94,8 +94,8 @@
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-    >>> from lp.registry.interfaces.person import IPersonSet
     >>> login(ANONYMOUS)
     >>> ubuntu_branches = getUtility(ILaunchpadCelebrities).ubuntu_branches
     >>> ignored = removeSecurityProxy(ubuntu_branches).addMember(

=== modified file 'lib/lp/code/stories/branches/xx-branch-index.txt'
--- lib/lp/code/stories/branches/xx-branch-index.txt	2010-09-27 19:39:21 +0000
+++ lib/lp/code/stories/branches/xx-branch-index.txt	2010-10-20 01:49:43 +0000
@@ -4,13 +4,13 @@
 Imports used later in the document:
 
     >>> import pytz
-    >>> from datetime import datetime
     >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates
+    >>> from datetime import datetime
     >>> from lp.code.enums import BranchType
     >>> from lp.code.bzr import BranchFormat, RepositoryFormat
+    >>> from lp.code.interfaces.branchlookup import IBranchLookup
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.code.interfaces.branchlookup import IBranchLookup
 
 Modifying/creating test data for this test case.
 

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt	2010-10-19 14:09:17 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt	2010-10-20 01:49:43 +0000
@@ -40,8 +40,8 @@
     >>> proposal = branch.addLandingTarget(bob, trunk)
     >>> proposal.requestReview()
     >>> # Ensure the date_created is later to ensure stable ordering.
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> from datetime import timedelta
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> removeSecurityProxy(proposal).date_created += timedelta(1)
 
     >>> branch = factory.makeProductBranch(

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-09-15 06:02:12 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-10-20 01:49:43 +0000
@@ -11,8 +11,8 @@
     >>> from zope.component import getUtility
     >>> from lp.code.enums import (
     ...     BranchSubscriptionNotificationLevel, CodeReviewNotificationLevel)
+    >>> from lp.code.interfaces.branchlookup import IBranchLookup
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.code.interfaces.branchlookup import IBranchLookup
     >>> subscriber = getUtility(IPersonSet).getByEmail(
     ...     '[e-mail]')
     >>> branch = getUtility(IBranchLookup).getByUniqueName(
@@ -601,8 +601,8 @@
 
     >>> login('[e-mail]')
     >>> from zope.security.proxy import removeSecurityProxy
+    >>> from difflib import unified_diff
     >>> from lp.code.model.diff import PreviewDiff
-    >>> from difflib import unified_diff
     >>> diff_text = ''.join(
     ...     unified_diff('', ['Fake Diff' + u'\u1010'.encode('utf-8')]))
     >>> preview_diff = PreviewDiff.create(diff_text, u'a', u'b', None, u'')

=== modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt'
--- lib/lp/code/stories/branches/xx-creating-branches.txt	2010-09-28 20:57:34 +0000
+++ lib/lp/code/stories/branches/xx-creating-branches.txt	2010-10-20 01:49:43 +0000
@@ -15,9 +15,9 @@
 
 Hosted branches use Launchpad as their primary location.
 
+    >>> from zope.component import getUtility
+    >>> from lp.code.enums import BranchType
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.code.enums import BranchType
-    >>> from zope.component import getUtility
     >>> login(ANONYMOUS)
     >>> redfish = getUtility(IProductSet).getByName('redfish')
     >>> branch = factory.makeProductBranch(

=== modified file 'lib/lp/code/stories/branches/xx-private-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-private-branch-listings.txt	2010-09-22 20:13:42 +0000
+++ lib/lp/code/stories/branches/xx-private-branch-listings.txt	2010-10-20 01:49:43 +0000
@@ -22,8 +22,8 @@
 Adding a private branch that is only visible by No Privileges Person
 (and Launchpad administrators).
 
+    >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates
-    >>> from zope.component import getUtility
     >>> from lp.code.enums import BranchType
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet

=== modified file 'lib/lp/code/stories/codeimport/xx-failing-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-failing-codeimport.txt	2010-03-18 15:39:58 +0000
+++ lib/lp/code/stories/codeimport/xx-failing-codeimport.txt	2010-10-20 01:49:43 +0000
@@ -6,8 +6,8 @@
     >>> login('[e-mail]')
     >>> from canonical.launchpad.testing.codeimporthelpers import (
     ...     make_finished_import)
+    >>> from canonical.config import config
     >>> from lp.code.interfaces.codeimportresult import CodeImportResultStatus
-    >>> from canonical.config import config
     >>> product = factory.makeProduct(name='imported')
     >>> owner = factory.makePerson(name='import-owner')
     >>> code_import = factory.makeProductCodeImport(

=== modified file 'lib/lp/code/stories/feeds/xx-revision-atom.txt'
--- lib/lp/code/stories/feeds/xx-revision-atom.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/code/stories/feeds/xx-revision-atom.txt	2010-10-20 01:49:43 +0000
@@ -55,8 +55,8 @@
     >>> login_person(mike)
     >>> team = factory.makeTeam(mike, 'The M Team', name='m-team')
     >>> ignored = team.addMember(mary, mike)
+    >>> from zope.component import getUtility
     >>> from lp.code.interfaces.revision import IRevisionSet
-    >>> from zope.component import getUtility
     >>> revision_set = getUtility(IRevisionSet)
     >>> revision_set.updateRevisionCacheForBranch(fooey_branch)
     >>> revision_set.updateRevisionCacheForBranch(fooix_branch)

=== modified file 'lib/lp/code/stories/webservice/xx-branch.txt'
--- lib/lp/code/stories/webservice/xx-branch.txt	2010-04-09 01:30:22 +0000
+++ lib/lp/code/stories/webservice/xx-branch.txt	2010-10-20 01:49:43 +0000
@@ -11,8 +11,8 @@
     >>> import pytz
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.code.enums import BranchLifecycleStatus, BranchType
+    >>> from lazr.restful.marshallers import DateTimeFieldMarshaller
     >>> from lp.code.interfaces.branch import IBranch
-    >>> from lazr.restful.marshallers import DateTimeFieldMarshaller
 
 To make this document a little more readable, we'll have to define some
 helpers. This one turns a JSON date/time response into a Python

=== modified file 'lib/lp/coop/answersbugs/stories/question-buglink.txt'
--- lib/lp/coop/answersbugs/stories/question-buglink.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/coop/answersbugs/stories/question-buglink.txt	2010-10-20 01:49:43 +0000
@@ -98,9 +98,9 @@
     # This should use a private bug in our sample data.
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
+    >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
     >>> from lp.bugs.interfaces.bug import IBugSet
-    >>> from canonical.database.sqlbase import flush_database_updates
     >>> login('[e-mail]')
     >>> private_bug = getUtility(IBugSet).get(6)
     >>> private_bug.setPrivate(True, getUtility(ILaunchBag).user)

=== modified file 'lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt'
--- lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt	2010-10-20 01:49:43 +0000
@@ -5,10 +5,10 @@
 
     >>> from zope.event import notify
     >>> from zope.interface import providedBy
+    >>> from lazr.lifecycle.event import ObjectModifiedEvent
+    >>> from lazr.lifecycle.snapshot import Snapshot
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lazr.lifecycle.event import ObjectModifiedEvent
-    >>> from lazr.lifecycle.snapshot import Snapshot
 
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
     >>> bugtask = get_bugtask_linked_to_question()

=== modified file 'lib/lp/hardwaredb/doc/hwdb-device-tables.txt'
--- lib/lp/hardwaredb/doc/hwdb-device-tables.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/hardwaredb/doc/hwdb-device-tables.txt	2010-10-20 01:49:43 +0000
@@ -2342,9 +2342,11 @@
 Instead of passing a seqence of bug IDs, we can also specify one or
 more bug tags.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskSearchParams, IBugTaskSet)
     >>> from canonical.launchpad.searchbuilder import any
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskSearchParams,
+    ...     IBugTaskSet,
+    ...     )
 
     >>> bugtask_set = getUtility(IBugTaskSet)
     >>> bugtasks = bugtask_set.search(

=== modified file 'lib/lp/hardwaredb/doc/hwdb-submission.txt'
--- lib/lp/hardwaredb/doc/hwdb-submission.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/hardwaredb/doc/hwdb-submission.txt	2010-10-20 01:49:43 +0000
@@ -21,8 +21,8 @@
   * submission_data: An XML file containing the collected data. This file is
     simply stored as a Librarian file, and parsed later by a cron job.
 
+    >>> from zope.component import getUtility
     >>> from StringIO import StringIO
-    >>> from zope.component import getUtility
     >>> from lp.hardwaredb.interfaces.hwdb import IHWDBApplication
     >>> data = StringIO('some data.')
     >>> data.filename = 'hardware-info'

=== modified file 'lib/lp/hardwaredb/doc/hwdb.txt'
--- lib/lp/hardwaredb/doc/hwdb.txt	2010-10-18 03:00:11 +0000
+++ lib/lp/hardwaredb/doc/hwdb.txt	2010-10-20 01:49:43 +0000
@@ -118,8 +118,8 @@
 The system fingerprint is stored in a separate table, HWSystemFingerprint.
 IHWSystemFingerPrintSet.createFingerprint creates a new row in this table.
 
+    >>> from lp.hardwaredb.interfaces.hwdb import IHWSystemFingerprintSet
     >>> from storm.store import Store
-    >>> from lp.hardwaredb.interfaces.hwdb import IHWSystemFingerprintSet
     >>> hw_fingerprint_set = getUtility(IHWSystemFingerprintSet)
     >>> fp = hw_fingerprint_set.createFingerprint(u'IBM T41')
     >>> fp.fingerprint
@@ -153,10 +153,12 @@
 HWSubmission table.
 
     >>> import pytz
+    >>> from StringIO import StringIO
     >>> from datetime import datetime
-    >>> from StringIO import StringIO
-    >>> from canonical.launchpad.interfaces import (
-    ...     HWSubmissionFormat, IHWSubmissionSet)
+    >>> from lp.hardwaredb.interfaces.hwdb import (
+    ...     HWSubmissionFormat,
+    ...     IHWSubmissionSet,
+    ...     )
     >>> date_created = datetime(2007, 04, 01, tzinfo=pytz.timezone('UTC'))
     >>> date_submitted = datetime(2007, 04, 02, tzinfo=pytz.timezone('UTC'))
     >>> submission_data = 'submission data'
@@ -366,8 +368,8 @@
 When an anonymous submitter later registers a Launchpad account, the field
 `owner` is updated.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IEmailAddressSet, PersonCreationRationale)
+    >>> from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
+    >>> from lp.registry.interfaces.person import PersonCreationRationale
     >>> user = getUtility(IPersonSet).ensurePerson(
     ...     u'[e-mail]', u'Beeblebrox',
     ...     PersonCreationRationale.OWNER_CREATED_LAUNCHPAD)

=== modified file 'lib/lp/registry/browser/tests/coc-views.txt'
--- lib/lp/registry/browser/tests/coc-views.txt	2010-04-12 20:26:24 +0000
+++ lib/lp/registry/browser/tests/coc-views.txt	2010-10-20 01:49:43 +0000
@@ -28,8 +28,8 @@
     ...             print '%s. %s' % ((index+1), extract_text(li))
     >>> user = factory.makePerson()
     >>> login_person(user)
+    >>> from lp.registry.interfaces.codeofconduct import ICodeOfConductSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.codeofconduct import ICodeOfConductSet
     >>> from canonical.launchpad.testing.pages import (
     ...     extract_text, find_tag_by_id)
     >>> coc_set = getUtility(ICodeOfConductSet)

=== modified file 'lib/lp/registry/browser/tests/milestone-views.txt'
--- lib/lp/registry/browser/tests/milestone-views.txt	2010-08-04 13:51:19 +0000
+++ lib/lp/registry/browser/tests/milestone-views.txt	2010-10-20 01:49:43 +0000
@@ -37,8 +37,8 @@
 The MilestoneView used can be adapted to a MilestoneInlineNavigationMenu
 for use with inline presentation of milestones.
 
+    >>> from canonical.launchpad.webapp.interfaces import INavigationMenu
     >>> from canonical.lazr.canonicalurl import nearest_adapter
-    >>> from canonical.launchpad.webapp.interfaces import INavigationMenu
 
     >>> view = create_view(milestone, name='+productseries-table-row')
     >>> nearest_adapter(view, INavigationMenu, name='overview')
@@ -330,8 +330,8 @@
 The MilestoneEditView is responsible for controlling the fields that the
 user may edit.
 
+    >>> from canonical.launchpad.webapp.authorization import check_permission
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from canonical.launchpad.webapp.authorization import check_permission
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> login_person(firefox.owner)

=== modified file 'lib/lp/registry/browser/tests/peoplemerge-views.txt'
--- lib/lp/registry/browser/tests/peoplemerge-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/browser/tests/peoplemerge-views.txt	2010-10-20 01:49:43 +0000
@@ -9,8 +9,8 @@
 Create a member of the registry team that is not a member of the admins
 team.
 
+    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
     >>> registry_experts = getUtility(ILaunchpadCelebrities).registry_experts
     >>> person_set = getUtility(IPersonSet)
     >>> registry_expert= factory.makeRegistryExpert()

=== modified file 'lib/lp/registry/browser/tests/person-admin-views.txt'
--- lib/lp/registry/browser/tests/person-admin-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/browser/tests/person-admin-views.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 Admistrators can access a subset of any IPerson's fields from the UI.
 The PersonAdministerView is registered under the +review name.
 
+    >>> from canonical.launchpad.webapp.authorization import check_permission
     >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
-    >>> from canonical.launchpad.webapp.authorization import check_permission
 
     >>> login('[e-mail]')
     >>> admin = getUtility(IOpenLaunchBag).user

=== modified file 'lib/lp/registry/browser/tests/person-views.txt'
--- lib/lp/registry/browser/tests/person-views.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/browser/tests/person-views.txt	2010-10-20 01:49:43 +0000
@@ -330,8 +330,7 @@
 Assigned specifications that do not display when they are not in an in
 progress state.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...    SpecificationImplementationStatus)
+    >>> from lp.blueprints.interfaces.specification import SpecificationImplementationStatus
 
     >>> login(user.preferredemail.email)
     >>> product = factory.makeProduct(name="tool", owner=user)
@@ -352,8 +351,7 @@
 specifications is a link to show all the specifications that the user is
 working on.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...    SpecificationDefinitionStatus)
+    >>> from lp.blueprints.interfaces.specification import SpecificationDefinitionStatus
 
     >>> spec.definition_status = SpecificationDefinitionStatus.APPROVED
     >>> newstate = spec.updateLifecycleStatus(user)

=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	2010-10-07 12:13:38 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2010-10-20 01:49:43 +0000
@@ -255,8 +255,8 @@
 
 The pillar involvement view uses the InvolvedMenu when rendering links.
 
+    >>> from lp.app.browser.tales import MenuAPI
     >>> from operator import attrgetter
-    >>> from lp.app.browser.tales import MenuAPI
 
 The menu when viewed from a product page.
 
@@ -271,8 +271,8 @@
     http://code.launchpad.dev/bread/+addbranch
     http://blueprints.launchpad.dev/bread/+addspec
 
+    >>> from lp.registry.browser.pillar import InvolvedMenu
     >>> from lp.testing.menu import check_menu_links
-    >>> from lp.registry.browser.pillar import InvolvedMenu
     >>> check_menu_links(InvolvedMenu(product))
     True
 

=== modified file 'lib/lp/registry/browser/tests/poll-views_0.txt'
--- lib/lp/registry/browser/tests/poll-views_0.txt	2010-10-14 18:42:19 +0000
+++ lib/lp/registry/browser/tests/poll-views_0.txt	2010-10-20 01:49:43 +0000
@@ -3,10 +3,10 @@
 First import some stuff and setup some things we'll use in this test.
 
   >>> from zope.component import getUtility, getMultiAdapter
+  >>> from zope.publisher.browser import TestRequest
+  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> from lp.registry.interfaces.person import IPersonSet
   >>> from lp.registry.interfaces.poll import IPollSet
-  >>> from zope.publisher.browser import TestRequest
-  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
   >>> from datetime import datetime, timedelta
   >>> login("[e-mail]")
   >>> ubuntu_team = getUtility(IPersonSet).getByName('ubuntu-team')

=== modified file 'lib/lp/registry/browser/tests/private-team-creation-views.txt'
--- lib/lp/registry/browser/tests/private-team-creation-views.txt	2010-08-23 16:51:11 +0000
+++ lib/lp/registry/browser/tests/private-team-creation-views.txt	2010-10-20 01:49:43 +0000
@@ -7,8 +7,10 @@
 
 Unprivileged users do not see the visibility widget.
 
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.person import PersonVisibility
+    >>> from lp.registry.interfaces.person import (
+    ...     IPersonSet,
+    ...     PersonVisibility,
+    ...     )
     >>> personset = getUtility(IPersonSet)
     >>> nopriv = personset.getByEmail('[e-mail]')
     >>> login('[e-mail]')

=== modified file 'lib/lp/registry/browser/tests/product-portlet-packages-view.txt'
--- lib/lp/registry/browser/tests/product-portlet-packages-view.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/registry/browser/tests/product-portlet-packages-view.txt	2010-10-20 01:49:43 +0000
@@ -8,8 +8,10 @@
 Create a helper to update the distribution source package cache, which
 does not happen automatically.
 
-    >>> from canonical.launchpad.testing.pages import find_tag_by_id
-    >>> from canonical.launchpad.testing.pages import extract_text
+    >>> from canonical.launchpad.testing.pages import (
+    ...     extract_text,
+    ...     find_tag_by_id,
+    ...     )
     >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
     >>> from lp.registry.interfaces.product import IProductSet
@@ -19,8 +21,8 @@
     >>> import transaction
     >>> from canonical.launchpad.scripts import QuietFakeLogger
     >>> logger = QuietFakeLogger()
+    >>> from canonical.config import config
     >>> from canonical.testing.layers import reconnect_stores
-    >>> from canonical.config import config
     >>> def updateCache():
     ...     # Switch to the statistician user who is the only user with
     ...     # write permission to the source package cache tables.

=== modified file 'lib/lp/registry/browser/tests/product-views.txt'
--- lib/lp/registry/browser/tests/product-views.txt	2010-09-01 19:42:24 +0000
+++ lib/lp/registry/browser/tests/product-views.txt	2010-10-20 01:49:43 +0000
@@ -20,10 +20,10 @@
 for the project is returned.  If the product has no project or the
 project has no driver then None is returned.
 
+    >>> from canonical.launchpad.ftests import ANONYMOUS
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from canonical.launchpad.ftests import ANONYMOUS
     >>> login('[e-mail]')
     >>> mozilla = getUtility(IProjectGroupSet).getByName('mozilla')
     >>> firefox = getUtility(IProductSet).getByName('firefox')

=== modified file 'lib/lp/registry/browser/tests/team-views.txt'
--- lib/lp/registry/browser/tests/team-views.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/registry/browser/tests/team-views.txt	2010-10-20 01:49:43 +0000
@@ -2,9 +2,9 @@
 
 == Home page ==
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, ITeamMembershipSet)
     >>> from zope.component import getMultiAdapter
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.teammembership import ITeamMembershipSet
     >>> person_set = getUtility(IPersonSet)
 
 On a team home page, we show up to the latest five members who were approved

=== modified file 'lib/lp/registry/doc/announcement.txt'
--- lib/lp/registry/doc/announcement.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/announcement.txt	2010-10-20 01:49:43 +0000
@@ -13,8 +13,10 @@
     >>> import pytz
     >>> NOW = datetime.utcnow().replace(tzinfo=pytz.utc)
     >>> FUTURE = NOW + timedelta(days=10)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IAnnouncementSet, IDistributionSet, IProductSet, IProjectGroupSet)
+    >>> from lp.registry.interfaces.announcement import IAnnouncementSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
     >>> announcements = getUtility(IAnnouncementSet)
     >>> kubuntu = getUtility(IDistributionSet).getByName('kubuntu')
     >>> apache = getUtility(IProjectGroupSet).getByName('apache')

=== modified file 'lib/lp/registry/doc/commercialsubscription.txt'
--- lib/lp/registry/doc/commercialsubscription.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/commercialsubscription.txt	2010-10-20 01:49:43 +0000
@@ -7,8 +7,8 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     ICommercialSubscription, IProductSet)
+    >>> from lp.registry.interfaces.commercialsubscription import ICommercialSubscription
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from canonical.launchpad.ftests import login, ANONYMOUS
     >>> login('[e-mail]')
 

=== modified file 'lib/lp/registry/doc/distribution-mirror.txt'
--- lib/lp/registry/doc/distribution-mirror.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/distribution-mirror.txt	2010-10-20 01:49:43 +0000
@@ -5,12 +5,20 @@
 
     >>> from datetime import datetime, timedelta
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     ICountrySet, IDistributionSet, IDistributionMirrorSet,
-    ...     IDistroArchSeriesSet, IDistroSeriesSet, ILibraryFileAliasSet,
-    ...     IPersonSet, MirrorContent, MirrorSpeed, MirrorStatus)
+    >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.distributionmirror import (
+    ...     IDistributionMirrorSet,
+    ...     MirrorContent,
+    ...     MirrorSpeed,
+    ...     MirrorStatus,
+    ...     )
+    >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
     >>> from lp.registry.interfaces.series import SeriesStatus
-    >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
+    >>> from lp.services.worlddata.interfaces.country import ICountrySet
+    >>> from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
     >>> mirrorset = getUtility(IDistributionMirrorSet)
     >>> distroset = getUtility(IDistributionSet)
     >>> ubuntu = distroset.get(1)

=== modified file 'lib/lp/registry/doc/distribution-sourcepackage.txt'
--- lib/lp/registry/doc/distribution-sourcepackage.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/registry/doc/distribution-sourcepackage.txt	2010-10-20 01:49:43 +0000
@@ -16,8 +16,8 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IDistributionSourcePackage)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
     >>> debian = getUtility(IDistributionSet).getByName("debian")
     >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
 
@@ -87,8 +87,8 @@
 sorted by distroseries and component with publications in proposed and backports
 excluded.
 
-    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
     >>> from lp.soyuz.enums import PackagePublishingStatus
+    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
     >>> publisher = SoyuzTestPublisher()
     >>> publisher.prepareBreezyAutotest()
     >>> warty = ubuntu['warty']

=== modified file 'lib/lp/registry/doc/distribution.txt'
--- lib/lp/registry/doc/distribution.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/distribution.txt	2010-10-20 01:49:43 +0000
@@ -70,9 +70,8 @@
 
     >>> from lp.registry.model.sourcepackagename import (
     ...                                          SourcePackageName)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSourcePackage,
-    ...     IDistributionSourcePackageRelease)
+    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
+    >>> from lp.soyuz.interfaces.distributionsourcepackagerelease import IDistributionSourcePackageRelease
 
     >>> evo = SourcePackageName.byName("evolution")
     >>> evo_ubuntu = ubuntu.getSourcePackage(evo)
@@ -571,9 +570,7 @@
 
 We can get only valid specs (those that are not obsolete or superseded):
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     SpecificationDefinitionStatus,
-    ...     )
+    >>> from lp.blueprints.interfaces.specification import SpecificationDefinitionStatus
     >>> login('[e-mail]')
     >>> for spec in kubuntu.specifications():
     ...     # Do this here, otherwise, the change will be flush before

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-10-20 01:49:43 +0000
@@ -22,8 +22,11 @@
     >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistroSeries, IDistroSeriesSet, IDistributionSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.distroseries import (
+    ...     IDistroSeries,
+    ...     IDistroSeriesSet,
+    ...     )
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     IHasTranslationImports)
     >>> distroseriesset = getUtility(IDistroSeriesSet)
@@ -247,8 +250,8 @@
     devel
     translations
 
-    >>> from canonical.launchpad.interfaces import (
-    ...    IComponentSet, ISectionSet)
+    >>> from lp.soyuz.interfaces.component import IComponentSet
+    >>> from lp.soyuz.interfaces.section import ISectionSet
     >>> python = getUtility(ISectionSet).ensure('python')
 
     >>> hoary.addSection(python)
@@ -502,10 +505,9 @@
 DistroSeries can build meta objects for packages
 ------------------------------------------------
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ISourcePackage,
-    ...     IDistroSeriesBinaryPackage,
-    ...     IDistroSeriesSourcePackageRelease)
+    >>> from lp.registry.interfaces.sourcepackage import ISourcePackage
+    >>> from lp.soyuz.interfaces.distroseriesbinarypackage import IDistroSeriesBinaryPackage
+    >>> from lp.soyuz.interfaces.distroseriessourcepackagerelease import IDistroSeriesSourcePackageRelease
 
     >>> pmount_src_name = SourcePackageName.byName('pmount')
     >>> pmount_source = hoary.getSourcePackage(pmount_src_name)
@@ -709,8 +711,7 @@
     4
     >>> warty_mozilla_pub_bin = warty_mozilla_pub_binaries[0]
 
-    >>> from canonical.launchpad.interfaces import (
-    ...    IBinaryPackagePublishingHistory)
+    >>> from lp.soyuz.interfaces.publishing import IBinaryPackagePublishingHistory
     >>> verifyObject(IBinaryPackagePublishingHistory, warty_mozilla_pub_bin)
     True
 

=== modified file 'lib/lp/registry/doc/entitlement.txt'
--- lib/lp/registry/doc/entitlement.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/entitlement.txt	2010-10-20 01:49:43 +0000
@@ -7,12 +7,17 @@
 
     >>> from datetime import datetime
     >>> import pytz
+    >>> from canonical.database.sqlbase import flush_database_updates
+    >>> from canonical.launchpad.ftests import login
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     EntitlementQuota, EntitlementState, EntitlementType,
-    ...     IEntitlement, IEntitlementSet, IPersonSet)
-    >>> from canonical.launchpad.ftests import login
-    >>> from canonical.database.sqlbase import flush_database_updates
+    >>> from lp.registry.interfaces.entitlement import (
+    ...     EntitlementQuota,
+    ...     EntitlementState,
+    ...     EntitlementType,
+    ...     IEntitlement,
+    ...     IEntitlementSet,
+    ...     )
+    >>> from lp.registry.interfaces.person import IPersonSet
 
 The logged in user must be an admin in order to change the quota.
 

=== modified file 'lib/lp/registry/doc/featuredproject.txt'
--- lib/lp/registry/doc/featuredproject.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/registry/doc/featuredproject.txt	2010-10-20 01:49:43 +0000
@@ -6,9 +6,10 @@
 projects is stored in the FeaturedProject table, and managed through the
 PillarNameSet.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IPillarNameSet, IProductSet, IProjectGroupSet
-    ...     )
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.pillar import IPillarNameSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
     >>> pillar_set = getUtility(IPillarNameSet)
     >>> def isFeatured(project):
     ...     return project in getUtility(IPillarNameSet).featured_projects

=== modified file 'lib/lp/registry/doc/gpg-signatures.txt'
--- lib/lp/registry/doc/gpg-signatures.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/gpg-signatures.txt	2010-10-20 01:49:43 +0000
@@ -19,8 +19,8 @@
     >>> bag.user.name
     u'name12'
 
+    >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces.gpghandler import IGPGHandler
-    >>> from zope.component import getUtility
     >>> gpghandler = getUtility(IGPGHandler)
 
 The text below was "clear signed" by 0xDFD20543 master key:

=== modified file 'lib/lp/registry/doc/gpgkey.txt'
--- lib/lp/registry/doc/gpgkey.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/registry/doc/gpgkey.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,11 @@
 Launchpad models GPG keys in a GPGKey class.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IGPGKeySet, IPersonSet, GPGKeyAlgorithm)
+    >>> from lp.registry.interfaces.gpg import (
+    ...     GPGKeyAlgorithm,
+    ...     IGPGKeySet,
+    ...     )
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> personset = getUtility(IPersonSet)
     >>> foobar = personset.getByName('name16')
     >>> gpgkeyset = getUtility(IGPGKeySet)

=== modified file 'lib/lp/registry/doc/irc.txt'
--- lib/lp/registry/doc/irc.txt	2009-06-30 16:51:21 +0000
+++ lib/lp/registry/doc/irc.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 IRC IDs are associated with a person and must be created through the
 IIrcIDSet utility.
 
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.role import IHasOwner
-    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.irc import IIrcID, IIrcIDSet
 
 The new() method of IIrcIDSet takes the person who will be associated

=== modified file 'lib/lp/registry/doc/jabber.txt'
--- lib/lp/registry/doc/jabber.txt	2009-06-30 16:51:21 +0000
+++ lib/lp/registry/doc/jabber.txt	2010-10-20 01:49:43 +0000
@@ -3,8 +3,8 @@
 Jabber IDs are associated with a person and must be created through the
 IJabberIDSet utility.
 
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.role import IHasOwner
-    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.jabber import (
     ...     IJabberID, IJabberIDSet)
 

=== modified file 'lib/lp/registry/doc/karmacache.txt'
--- lib/lp/registry/doc/karmacache.txt	2010-10-04 19:50:45 +0000
+++ lib/lp/registry/doc/karmacache.txt	2010-10-20 01:49:43 +0000
@@ -9,10 +9,10 @@
 which runs daily. The script does that by using the IKarmaCacheManager API.
 
     >>> from zope.component import getUtility
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> from lp.registry.interfaces.karma import IKarmaCacheManager
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.model.karma import KarmaCategory
-    >>> from canonical.launchpad.interfaces import (
-    ...     IKarmaCacheManager, IPersonSet)
-    >>> from canonical.testing.layers import LaunchpadZopelessLayer
 
     >>> LaunchpadZopelessLayer.switchDbUser('karma')
     >>> karmacachemanager = getUtility(IKarmaCacheManager)

=== modified file 'lib/lp/registry/doc/karmacontext.txt'
--- lib/lp/registry/doc/karmacontext.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/registry/doc/karmacontext.txt	2010-10-20 01:49:43 +0000
@@ -10,8 +10,10 @@
     >>> import operator
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, IProductSet, IDistributionSet, IKarmaContext)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.karma import IKarmaContext
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> salgado = getUtility(IPersonSet).getByName('salgado')
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')

=== modified file 'lib/lp/registry/doc/mailinglist-subscriptions-xmlrpc.txt'
--- lib/lp/registry/doc/mailinglist-subscriptions-xmlrpc.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/mailinglist-subscriptions-xmlrpc.txt	2010-10-20 01:49:43 +0000
@@ -290,9 +290,9 @@
 itself is private, so is its archive, and then messages are not sent to the
 archiver email address.
 
+    >>> from zope.component import queryAdapter
+    >>> from canonical.lazr.interfaces.objectprivacy import IObjectPrivacy
     >>> from lp.registry.interfaces.person import PersonVisibility
-    >>> from canonical.lazr.interfaces.objectprivacy import IObjectPrivacy
-    >>> from zope.component import queryAdapter
     >>> team_three = new_team('team-three')
     >>> queryAdapter(team_three, IObjectPrivacy).is_private
     False

=== modified file 'lib/lp/registry/doc/mailinglists.txt'
--- lib/lp/registry/doc/mailinglists.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/mailinglists.txt	2010-10-20 01:49:43 +0000
@@ -7,8 +7,10 @@
 an existing team.  This is done through an IMailingListSet utility.
 
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IMailingList, IMailingListSet)
+    >>> from lp.registry.interfaces.mailinglist import (
+    ...     IMailingList,
+    ...     IMailingListSet,
+    ...     )
     >>> list_set = getUtility(IMailingListSet)
     >>> verifyObject(IMailingListSet, list_set)
     True
@@ -414,9 +416,9 @@
 subscription') will fire an instance of the ObjectModifiedEvent.
 
     # Register an event listener that will print event it receives.
+    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
     >>> from lp.registry.interfaces.mailinglist import IMailingList
-    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> def print_event(object, event):
     ...     print "Received %s on %s" % (
     ...         event.__class__.__name__.split('.')[-1],

=== modified file 'lib/lp/registry/doc/mentoringoffer.txt'
--- lib/lp/registry/doc/mentoringoffer.txt	2010-10-11 16:17:45 +0000
+++ lib/lp/registry/doc/mentoringoffer.txt	2010-10-20 01:49:43 +0000
@@ -6,8 +6,8 @@
 specification. Here, Foo Bar will make an offer on a spec and a bug:
 
     >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from canonical.launchpad.ftests import login, syncUpdate
     >>> distroset = getUtility(IDistributionSet)
     >>> personset = getUtility(IPersonSet)
@@ -86,8 +86,11 @@
 show up there.
 
     >>> firefox = productset.getByName('firefox')
-    >>> from canonical.launchpad.interfaces import (
-    ...     BugTaskImportance, BugTaskStatus, IBugTaskSet)
+    >>> from lp.bugs.interfaces.bugtask import (
+    ...     BugTaskImportance,
+    ...     BugTaskStatus,
+    ...     IBugTaskSet,
+    ...     )
     >>> bugtaskset = getUtility(IBugTaskSet)
     >>> ff_task = bugtaskset.createTask(
     ...     bug=bug2, product=firefox, owner=mark,
@@ -201,8 +204,8 @@
 
 When a spec or a bug is completed, it drops off the mentoring lists.
 
-   >>> from canonical.launchpad.interfaces import (
-   ...     BugTaskStatus, SpecificationImplementationStatus)
+   >>> from lp.blueprints.interfaces.specification import SpecificationImplementationStatus
+   >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
    >>> bug2.is_complete
    False
    >>> from canonical.database.sqlbase import flush_database_updates

=== modified file 'lib/lp/registry/doc/message-holds.txt'
--- lib/lp/registry/doc/message-holds.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/message-holds.txt	2010-10-20 01:49:43 +0000
@@ -483,8 +483,8 @@
     ...         return self
     ...     signature = object()
 
+    >>> from canonical.launchpad.mail.handlers import MaloneHandler
     >>> from email import message_from_string
-    >>> from canonical.launchpad.mail.handlers import MaloneHandler
     >>> malone_msg = message_from_string(message_text, _class=SignedMessage)
 
     # Tweak the Subject so we can tell the two message apart.

=== modified file 'lib/lp/registry/doc/milestone.txt'
--- lib/lp/registry/doc/milestone.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/registry/doc/milestone.txt	2010-10-20 01:49:43 +0000
@@ -287,12 +287,13 @@
 
     >>> from lp.bugs.model.bugnotification import (
     ...     BugNotification)
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, IPersonSet, IProductSet)
+    >>> from zope.event import notify
+    >>> from zope.interface import providedBy
     >>> from lazr.lifecycle.event import ObjectModifiedEvent
     >>> from lazr.lifecycle.snapshot import Snapshot
-    >>> from zope.event import notify
-    >>> from zope.interface import providedBy
+    >>> from lp.bugs.interfaces.bug import IBugSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> firefox_trunk = firefox.getSeries('trunk')
     >>> [milestone_one] = [milestone
@@ -519,8 +520,8 @@
 committed status are updated to fix released. An ObjectModifiedEvent
 event is signaled for each changed bug task.
 
+    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
-    >>> from canonical.launchpad.ftests.event import TestEventListener
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus, IBugTask
 
     >>> def print_event(object, event):