Merge lp:~henninge/launchpad/devel-remove-c-l-i into lp:launchpad

[Henning Eggers]

Import interfaces from the right places in lp.translations.

Removed all "from canonical.launchpad.interfaces import" lines by either specifying the the right submodule or the correct module in the lp.* tree. I did this for all *.py and *.txt files in the lp.translations subtree. I skipped *.zcml files because Curtis will be doing them in a separate branch.

[Gavin Panella (allenap)]

Woohoo!

review: Approve

[lp:~henninge/launchpad/devel-remove-c-l-i]

11663. By Henning Eggers on 2010-10-01

Fixed typos.

11664. By Henning Eggers on 2010-10-01

Reverted import in remove-translations-by.

11665. By Henning Eggers on 2010-10-01

Merged devel into devel-remove-c-l-i.

11666. By Henning Eggers on 2010-10-04

Merged devel into devel-remove-c-l-i.

[Brad Crittenden (bac)]

Is this branch ready to land or are you blocked? If the branch is abandoned please change the MP status to 'Rejected'.

[Henning Eggers (henninge)]

Yes, the branch is abandoned. I gave up on this and I can't exactly why atm.

Unmerged revisions

11666. By Henning Eggers on 2010-10-04

Merged devel into devel-remove-c-l-i.

11665. By Henning Eggers on 2010-10-01

Merged devel into devel-remove-c-l-i.

11664. By Henning Eggers on 2010-10-01

Reverted import in remove-translations-by.

11663. By Henning Eggers on 2010-10-01

Fixed typos.

11662. By Henning Eggers on 2010-09-30

Removed all direct imports for c.l.interfaces.

=== modified file 'lib/lp/translations/browser/pofile.py'
--- lib/lp/translations/browser/pofile.py	2010-08-31 11:11:09 +0000
+++ lib/lp/translations/browser/pofile.py	2010-10-04 09:44:48 +0000
@@ -26,7 +26,6 @@
 
 from canonical.config import config
 from canonical.launchpad import _
-from canonical.launchpad.interfaces import ILaunchBag
 from canonical.launchpad.webapp import (
     canonical_url,
     enabled_with_permission,
@@ -36,6 +35,7 @@
     NavigationMenu,
     )
 from canonical.launchpad.webapp.batching import BatchNavigator
+from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.launchpad.webapp.menu import structured
 from canonical.lazr.utils import smartquote
 from lp.app.errors import (

=== modified file 'lib/lp/translations/browser/tests/distroseries-views.txt'
--- lib/lp/translations/browser/tests/distroseries-views.txt	2010-08-02 23:34:01 +0000
+++ lib/lp/translations/browser/tests/distroseries-views.txt	2010-10-04 09:44:48 +0000
@@ -4,7 +4,7 @@
 Let's use ubuntu/hoary for these tests.
 
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from canonical.launchpad.interfaces import IDistributionSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.series import SeriesStatus
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> hoary = ubuntu.getSeries('hoary')
@@ -25,8 +25,10 @@
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.translations.browser.distroseries import (
     ...     DistroSeriesView)
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, ITeamMembershipSet, TeamMembershipStatus)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.teammembership import (
+    ...     ITeamMembershipSet, TeamMembershipStatus)
     >>> from lp.app.errors import TranslationUnavailable
 
     >>> def check_translations_access(distroseries):

=== modified file 'lib/lp/translations/browser/tests/translationimportqueue-views.txt'
--- lib/lp/translations/browser/tests/translationimportqueue-views.txt	2010-07-21 05:41:41 +0000
+++ lib/lp/translations/browser/tests/translationimportqueue-views.txt	2010-10-04 09:44:48 +0000
@@ -153,7 +153,7 @@
 
 The Ubuntu distribution gets special treatment for the language pack flag.
 
-    >>> from canonical.launchpad.interfaces import (
+    >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
     >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
     >>> ubuntuseries = factory.makeDistroRelease(ubuntu)

=== modified file 'lib/lp/translations/doc/canonical_url_examples.txt'
--- lib/lp/translations/doc/canonical_url_examples.txt	2010-07-19 15:35:31 +0000
+++ lib/lp/translations/doc/canonical_url_examples.txt	2010-10-04 09:44:48 +0000
@@ -11,7 +11,8 @@
 
 The Rosetta homepage.
 
-    >>> from canonical.launchpad.interfaces import IRosettaApplication
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     IRosettaApplication)
     >>> canonical_url(getUtility(IRosettaApplication))
     u'http://launchpad.dev/translations'
 
@@ -29,7 +30,7 @@
 
     >>> from lp.registry.interfaces.sourcepackagename import (
     ...     ISourcePackageNameSet)
-    >>> from canonical.launchpad.interfaces import IDistributionSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> sourcepackagenameset = getUtility(ISourcePackageNameSet)
     >>> sourcepackagename = sourcepackagenameset['evolution']
     >>> distroset = getUtility(IDistributionSet)
@@ -81,7 +82,7 @@
 Now we can get an upstream subset and do the same sorts of thing as we did
 with the distro subset.
 
-    >>> from canonical.launchpad.interfaces import IProductSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> productset = getUtility(IProductSet)
     >>> evolution_product = productset['evolution']
     >>> evolution_trunk_series = evolution_product.getSeries('trunk')

=== modified file 'lib/lp/translations/doc/distroseries-language.txt'
--- lib/lp/translations/doc/distroseries-language.txt	2010-08-06 07:40:52 +0000
+++ lib/lp/translations/doc/distroseries-language.txt	2010-10-04 09:44:48 +0000
@@ -7,8 +7,9 @@
 will work with spanish in Hoary first.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistroSeriesSet, IDistributionSet, ILanguageSet)
+    >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.translations.interfaces.distroserieslanguage import (
     ...     IDistroSeriesLanguage)
     >>> distroseriesset = getUtility(IDistroSeriesSet)

=== modified file 'lib/lp/translations/doc/language-pack.txt'
--- lib/lp/translations/doc/language-pack.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/doc/language-pack.txt	2010-10-04 09:44:48 +0000
@@ -11,8 +11,7 @@
     >>> from cStringIO import StringIO
     >>> from zope.component import getUtility
     >>> from zope.interface import providedBy
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.translations.interfaces.languagepack import (
     ...     ILanguagePack,
     ...     ILanguagePackSet,

=== modified file 'lib/lp/translations/doc/poexport-language-pack.txt'
--- lib/lp/translations/doc/poexport-language-pack.txt	2010-04-28 05:40:02 +0000
+++ lib/lp/translations/doc/poexport-language-pack.txt	2010-10-04 09:44:48 +0000
@@ -12,7 +12,8 @@
     >>> import transaction
     >>> from canonical.launchpad.ftests import login
     >>> from canonical.launchpad.helpers import string_to_tarfile
-    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
     >>> from lp.translations.scripts.language_pack import \
     ...    export_language_pack
     >>> from canonical.librarian.interfaces import ILibrarianClient

=== modified file 'lib/lp/translations/doc/poexport-queue.txt'
--- lib/lp/translations/doc/poexport-queue.txt	2010-03-05 15:31:22 +0000
+++ lib/lp/translations/doc/poexport-queue.txt	2010-10-04 09:44:48 +0000
@@ -11,7 +11,7 @@
 
     >>> import transaction
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.testing.faketransaction import FakeTransaction
     >>> from lp.testing.mail_helpers import pop_notifications, print_emails
     >>> from lp.translations.scripts.po_export_queue import ExportResult

=== modified file 'lib/lp/translations/doc/pofile.txt'
--- lib/lp/translations/doc/pofile.txt	2010-09-01 10:03:11 +0000
+++ lib/lp/translations/doc/pofile.txt	2010-10-04 09:44:48 +0000
@@ -6,9 +6,11 @@
     >>> import pytz
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, ILanguageSet, IPersonSet,
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.sourcepackagename import (
     ...     ISourcePackageNameSet)
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.translations.interfaces.pofile import IPOFile
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet
     >>> sourcepackagenameset = getUtility(ISourcePackageNameSet)
@@ -367,8 +369,9 @@
 
 Do some needed imports.
 
-    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
-    >>> from canonical.launchpad.interfaces import IProductSet
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.translations.interfaces.translationgroup import (
     ...     ITranslationGroupSet, TranslationPermission)
     >>> from lp.translations.model.pofile import POFile

=== modified file 'lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt'
--- lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt	2009-11-17 09:50:33 +0000
+++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt	2010-10-04 09:44:48 +0000
@@ -19,8 +19,9 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue, RosettaImportStatus)
     >>> from lp.translations.model.potemplate import POTemplateSubset

=== modified file 'lib/lp/translations/doc/poimport-pofile-old-po-imported.txt'
--- lib/lp/translations/doc/poimport-pofile-old-po-imported.txt	2009-11-17 09:50:33 +0000
+++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt	2010-10-04 09:44:48 +0000
@@ -16,8 +16,9 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue)
     >>> from lp.translations.model.potemplate import POTemplateSubset

=== modified file 'lib/lp/translations/doc/poimport-pofile-syntax-error.txt'
--- lib/lp/translations/doc/poimport-pofile-syntax-error.txt	2009-11-17 09:50:33 +0000
+++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt	2010-10-04 09:44:48 +0000
@@ -7,8 +7,9 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue)
     >>> from lp.translations.model.potemplate import POTemplateSubset

=== modified file 'lib/lp/translations/doc/poimport-potemplate-syntax-error.txt'
--- lib/lp/translations/doc/poimport-potemplate-syntax-error.txt	2009-11-17 09:50:33 +0000
+++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt	2010-10-04 09:44:48 +0000
@@ -7,8 +7,9 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue)
     >>> from lp.translations.model.potemplate import POTemplateSubset

=== modified file 'lib/lp/translations/doc/poimport.txt'
--- lib/lp/translations/doc/poimport.txt	2010-07-13 15:02:20 +0000
+++ lib/lp/translations/doc/poimport.txt	2010-10-04 09:44:48 +0000
@@ -9,8 +9,11 @@
 Here are some imports we need to get this test running.
 
     >>> from canonical.launchpad.ftests import syncUpdate
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILanguageSet, ILaunchpadCelebrities, IPersonSet, IProductSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue, RosettaImportStatus)
     >>> from lp.registry.model.sourcepackagename import SourcePackageName

=== modified file 'lib/lp/translations/doc/potmsgset.txt'
--- lib/lp/translations/doc/potmsgset.txt	2010-09-07 15:26:49 +0000
+++ lib/lp/translations/doc/potmsgset.txt	2010-10-04 09:44:48 +0000
@@ -14,8 +14,9 @@
     >>> from lp.translations.model.translationmessage import (
     ...     TranslationMessage)
     >>> from lp.translations.interfaces.potmsgset import IPOTMsgSet
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILanguageSet, IPersonSet, IProductSet)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
 
     >>> potemplate = factory.makePOTemplate()
     >>> potmsgset = factory.makePOTMsgSet(
@@ -657,8 +658,7 @@
 translation for exactly the same English string, but in a different
 translation template.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IProductSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet
 
 Suggestions between modules depend also on whether the other translation

=== modified file 'lib/lp/translations/doc/request_country.txt'
--- lib/lp/translations/doc/request_country.txt	2009-10-22 11:55:51 +0000
+++ lib/lp/translations/doc/request_country.txt	2010-10-04 09:44:48 +0000
@@ -21,7 +21,7 @@
 
 Here's us converting it to a country.
 
-    >>> from canonical.launchpad.interfaces import ICountry
+    >>> from lp.services.worlddata.interfaces.country import ICountry
     >>> country = ICountry(request)
     >>> country.name
     u'United Kingdom'

=== modified file 'lib/lp/translations/doc/rosetta-karma.txt'
--- lib/lp/translations/doc/rosetta-karma.txt	2010-07-16 16:51:52 +0000
+++ lib/lp/translations/doc/rosetta-karma.txt	2010-10-04 09:44:48 +0000
@@ -7,9 +7,10 @@
 like SQLObjects are not persistent between transactions.
 
     >>> import transaction
-    >>> from canonical.launchpad.interfaces import (
-    ...     IKarmaActionSet, IPersonSet,
+    >>> from canonical.launchpad.interfaces.launchpad import (
     ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.karma import IKarmaActionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue, RosettaImportStatus)
     >>> from lp.translations.model.potemplate import POTemplate

=== modified file 'lib/lp/translations/doc/rosetta-poimport-script.txt'
--- lib/lp/translations/doc/rosetta-poimport-script.txt	2010-04-01 04:29:46 +0000
+++ lib/lp/translations/doc/rosetta-poimport-script.txt	2010-10-04 09:44:48 +0000
@@ -1,8 +1,9 @@
 =  PO import script =
 
     >>> from lp.translations.model.potemplate import POTemplate
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue,
     ...     RosettaImportStatus)

=== modified file 'lib/lp/translations/doc/sourcepackagerelease-translations.txt'
--- lib/lp/translations/doc/sourcepackagerelease-translations.txt	2010-07-23 11:18:54 +0000
+++ lib/lp/translations/doc/sourcepackagerelease-translations.txt	2010-10-04 09:44:48 +0000
@@ -44,7 +44,8 @@
 
 And the 'katie' celebrity as the user responsible for the transalation.
 
-   >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
+   >>> from canonical.launchpad.interfaces.launchpad import (
+   ...     ILaunchpadCelebrities)
    >>> katie = getUtility(ILaunchpadCelebrities).katie
 
 Before the final upload, we can see that the translation queue for the

=== modified file 'lib/lp/translations/doc/translationgroup.txt'
--- lib/lp/translations/doc/translationgroup.txt	2010-09-03 06:37:26 +0000
+++ lib/lp/translations/doc/translationgroup.txt	2010-10-04 09:44:48 +0000
@@ -12,16 +12,16 @@
     ...     ITranslationGroupSet)
     >>> translation_group_set = getUtility(ITranslationGroupSet)
 
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> person_set = getUtility(IPersonSet)
 
-    >>> from canonical.launchpad.interfaces import IProductSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> product_set = getUtility(IProductSet)
 
     >>> from lp.translations.interfaces.translator import ITranslatorSet
     >>> translator_set = getUtility(ITranslatorSet)
 
-    >>> from canonical.launchpad.interfaces import ILanguageSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> language_set = getUtility(ILanguageSet)
 
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet

=== modified file 'lib/lp/translations/doc/translationimportqueue.txt'
--- lib/lp/translations/doc/translationimportqueue.txt	2010-08-31 23:03:45 +0000
+++ lib/lp/translations/doc/translationimportqueue.txt	2010-10-04 09:44:48 +0000
@@ -27,9 +27,13 @@
     >>> import transaction
     >>> from zope.component import getUtility
     >>> from canonical.database.sqlbase import flush_database_updates
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IDistroSeries, ILaunchpadCelebrities,
-    ...     IProductSet, ISourcePackageNameSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.distroseries import IDistroSeries
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet)
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue, RosettaImportStatus)
     >>> from lp.registry.model.distroseries import DistroSeries
@@ -256,7 +260,8 @@
 kdebase, kde-i18n-es and kde-l10n-sr-latin. The first is from where the .pot
 file come and the others have .po files.
 
-    >>> from canonical.launchpad.interfaces import ISourcePackageNameSet
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet)
     >>> sourcepackagenameset = getUtility(ISourcePackageNameSet)
     >>> kdebase = sourcepackagenameset.new('kdebase')
     >>> kde_i18n_es = sourcepackagenameset.new('kde-i18n-es')

=== modified file 'lib/lp/translations/doc/translationmessage.txt'
--- lib/lp/translations/doc/translationmessage.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/doc/translationmessage.txt	2010-10-04 09:44:48 +0000
@@ -4,8 +4,8 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILanguageSet, IPersonSet)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.translations.interfaces.translationmessage import (
     ...     ITranslationMessage)
     >>> from lp.translations.interfaces.translator import ITranslatorSet

=== modified file 'lib/lp/translations/doc/translationsoverview.txt'
--- lib/lp/translations/doc/translationsoverview.txt	2010-08-31 23:03:45 +0000
+++ lib/lp/translations/doc/translationsoverview.txt	2010-10-04 09:44:48 +0000
@@ -15,9 +15,10 @@
     >>> from zope.component import getUtility
     >>> from lp.registry.model.karma import KarmaCategory
     >>> from lp.registry.model.sourcepackagename import SourcePackageName
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IKarmaCacheManager, IPersonSet,
-    ...     IProductSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.karma import IKarmaCacheManager 
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
     >>> from lp.translations.interfaces.translationsoverview import (
     ...     ITranslationsOverview)
     >>> from canonical.testing import LaunchpadZopelessLayer

=== modified file 'lib/lp/translations/doc/translationsperson.txt'
--- lib/lp/translations/doc/translationsperson.txt	2010-09-02 11:33:28 +0000
+++ lib/lp/translations/doc/translationsperson.txt	2010-10-04 09:44:48 +0000
@@ -4,7 +4,7 @@
 object which provides translatable languages and translation history.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> personset = getUtility(IPersonSet)
     >>> from lp.translations.interfaces.translationsperson import (
     ...     ITranslationsPerson)

=== modified file 'lib/lp/translations/doc/translationtemplatesbuildbehavior.txt'
--- lib/lp/translations/doc/translationtemplatesbuildbehavior.txt	2010-09-28 11:05:14 +0000
+++ lib/lp/translations/doc/translationtemplatesbuildbehavior.txt	2010-10-04 09:44:48 +0000
@@ -23,8 +23,10 @@
 
     >>> from canonical.librarian.interfaces import ILibrarianClient
     >>> from StringIO import StringIO
-    >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet
-    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
+    >>> from canonical.launchpad.interfaces.librarian import (
+    ...     ILibraryFileAliasSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
 
 Choose an arbitrary file as the chroot tarball for the build slave.  It
 won't actually build, so it doesn't matter what's in there.

=== modified file 'lib/lp/translations/doc/vpoexport.txt'
--- lib/lp/translations/doc/vpoexport.txt	2010-07-14 06:36:24 +0000
+++ lib/lp/translations/doc/vpoexport.txt	2010-10-04 09:44:48 +0000
@@ -4,7 +4,7 @@
 exports in a more efficient way than fetching the entire objects.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import IDistributionSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.translations.interfaces.vpoexport import IVPOExportSet
 
     >>> vpoexportset = getUtility(IVPOExportSet)

=== modified file 'lib/lp/translations/model/translationtemplatesbuildbehavior.py'
--- lib/lp/translations/model/translationtemplatesbuildbehavior.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/model/translationtemplatesbuildbehavior.py	2010-10-04 09:44:48 +0000
@@ -15,7 +15,7 @@
 from zope.interface import implements
 from zope.security.proxy import removeSecurityProxy
 
-from canonical.launchpad.interfaces import ILaunchpadCelebrities
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior,
     )

=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-08-27 15:03:18 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-10-04 09:44:48 +0000
@@ -18,7 +18,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
-from canonical.launchpad.interfaces import ILaunchpadCelebrities
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.lpstorm import (
     IMasterStore,
     IStore,

=== modified file 'lib/lp/translations/stories/productseries/xx-productseries-translations.txt'
--- lib/lp/translations/stories/productseries/xx-productseries-translations.txt	2010-09-27 21:46:10 +0000
+++ lib/lp/translations/stories/productseries/xx-productseries-translations.txt	2010-10-04 09:44:48 +0000
@@ -195,9 +195,11 @@
 notice but not the link to the project's settings.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILaunchpadCelebrities, IPersonSet, ITeamMembershipSet,
-    ...     TeamMembershipStatus)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.teammembership import (
+    ...     ITeamMembershipSet, TeamMembershipStatus)
 
     # Log in so as to be able to create objects
     >>> admin_email = '[e-mail]'

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt	2009-11-09 17:08:21 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt	2010-10-04 09:44:48 +0000
@@ -163,8 +163,9 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILanguageSet, IPersonSet, IProductSet)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.translations.interfaces.translator import ITranslatorSet
 
     # Evolution uses Restricted mode, so a translation without reviewer

=== modified file 'lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt'
--- lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt	2010-09-28 00:07:37 +0000
+++ lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt	2010-10-04 09:44:48 +0000
@@ -52,7 +52,8 @@
 This is done to so see what the page will look like when they exist.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
     >>> from lp.translations.interfaces.translationgroup import (
     ...     TranslationPermission)
     >>> login('[e-mail]')

=== modified file 'lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt'
--- lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt	2010-10-04 09:44:48 +0000
@@ -85,8 +85,11 @@
     >>> from zope.component import getUtility
 
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, ILaunchpadCelebrities, IPersonSet)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    
 
     >>> # Log in so we can use utilities and the LaunchpadObjectFactory.
     >>> login('[e-mail]')

=== modified file 'lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt'
--- lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt	2010-04-29 12:38:47 +0000
+++ lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt	2010-10-04 09:44:48 +0000
@@ -501,8 +501,10 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.interfaces import (
-    ...     IDistributionSet, IPersonSet, ISourcePackageNameSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet)
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet
     >>> login("[e-mail]")
     >>> carlos = getUtility(IPersonSet).getByName('carlos')

=== modified file 'lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt'
--- lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt	2009-07-16 11:45:22 +0000
+++ lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt	2010-10-04 09:44:48 +0000
@@ -13,8 +13,9 @@
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.interfaces import (
-    ...     ILanguageSet, IPersonSet, IDistributionSet)
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
     >>> from lp.translations.interfaces.translator import ITranslatorSet
 
     >>> login('[e-mail]')

=== modified file 'lib/lp/translations/tests/potmsgset-update-translation.txt'
--- lib/lp/translations/tests/potmsgset-update-translation.txt	2010-03-13 02:27:53 +0000
+++ lib/lp/translations/tests/potmsgset-update-translation.txt	2010-10-04 09:44:48 +0000
@@ -4,7 +4,7 @@
   >>> from canonical.database.sqlbase import flush_database_updates
   >>> from lp.translations.model.pomsgid import POMsgID
   >>> from lp.translations.model.potemplate import POTemplate
-  >>> from canonical.launchpad.interfaces import IPersonSet
+  >>> from lp.registry.interfaces.person import IPersonSet
   >>> UTC = pytz.timezone('UTC')
 
 Get the PO msgid we will be working with.

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py	2010-08-27 11:19:54 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py	2010-10-04 09:44:48 +0000
@@ -13,7 +13,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
-from canonical.launchpad.interfaces import ILaunchpadCelebrities
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.testing import LaunchpadZopelessLayer
 from lp.buildmaster.enums import BuildStatus

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-08-25 11:07:19 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-10-04 09:44:48 +0000
@@ -10,7 +10,7 @@
 from zope.event import notify
 from zope.security.proxy import removeSecurityProxy
 
-from canonical.launchpad.interfaces import ILaunchpadCelebrities
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.webapp.interfaces import (
     DEFAULT_FLAVOR,
     IStoreSelector,