Merge lp:~jml/launchpad/interface-apocalypse into lp:launchpad

[Jonathan Lange]

Do not re-export anything from lib/canonical/launchpad/interfaces/__init__.py. Explicitly register webservice code.

This branch destroys lib/canonical/launchpad/interfaces/__init__.py

[Curtis Hovey (sinzui)]

\o/ Please land this.

review: Needs Fixing (code)

[Michael Hudson-Doyle (mwhudson)]

Really.

review: Approve

=== modified file 'lib/canonical/launchpad/doc/renamed-view.txt'
--- lib/canonical/launchpad/doc/renamed-view.txt	2010-10-09 16:36:22 +0000
+++ lib/canonical/launchpad/doc/renamed-view.txt	2010-11-10 10:51:17 +0000
@@ -103,7 +103,7 @@
     ...   <include package="canonical.launchpad.webapp" file="meta.zcml" />
     ...   <include package="zope.app.zcmlfiles" file="meta.zcml" />
     ...   <browser:renamed-page
-    ...       for="canonical.launchpad.interfaces.IQuestionTarget"
+    ...       for="lp.answers.interfaces.questiontarget.IQuestionTarget"
     ...       name="+old_tickets_page"
     ...       new_name="+questions"
     ...       rootsite="answers"

=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
--- lib/canonical/launchpad/interfaces/__init__.py	2010-10-31 20:18:45 +0000
+++ lib/canonical/launchpad/interfaces/__init__.py	2010-11-10 10:51:17 +0000
@@ -1,146 +1,12 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=W0401,C0301
-
-__metaclass__ = type
-
-# XXX flacoste 2009/03/18 We should use specific imports instead of
-# importing from this module.
-
-# SKIP this file when formatting imports.
-from canonical.launchpad.interfaces.launchpad import *
-from lp.bugs.interfaces.malone import *
-from canonical.launchpad.interfaces.validation import *
-
-# these need to be at the top, because the others depend on them sometimes
-from lp.blueprints.interfaces.specificationtarget import *
-from lp.registry.interfaces.person import *
-from lp.registry.interfaces.pillar import *
-
-from canonical.launchpad.interfaces.account import *
-from lp.soyuz.interfaces.archive import *
-from lp.soyuz.interfaces.archivedependency import *
-from lp.soyuz.interfaces.archivepermission import *
-from lp.soyuz.interfaces.archivesubscriber import *
-from lp.registry.interfaces.announcement import *
-from canonical.launchpad.interfaces.authserver import *
-from canonical.launchpad.interfaces.authtoken import *
-from lp.soyuz.interfaces.binarypackagerelease import *
-from lp.soyuz.interfaces.binarypackagename import *
-from lp.bugs.interfaces.bugactivity import *
-from lp.bugs.interfaces.bugattachment import *
-from lp.bugs.interfaces.bug import *
-from lp.bugs.interfaces.bugbranch import *
-from lp.bugs.interfaces.bugcve import *
-from lp.bugs.interfaces.buglink import *
-from lp.bugs.interfaces.bugmessage import *
-from lp.bugs.interfaces.bugnomination import *
-from lp.bugs.interfaces.bugnotification import *
-from lp.bugs.interfaces.bugsubscription import *
-from lp.bugs.interfaces.bugsupervisor import *
-from lp.bugs.interfaces.bugtask import *
-from lp.bugs.interfaces.bugtarget import *
-from lp.bugs.interfaces.bugtracker import *
-from lp.bugs.interfaces.bugwatch import *
-from lp.soyuz.interfaces.binarypackagebuild import *
-from lp.buildmaster.interfaces.builder import *
-from lp.soyuz.interfaces.buildrecords import *
-from lp.registry.interfaces.codeofconduct import *
-from lp.registry.interfaces.commercialsubscription import *
-from lp.soyuz.interfaces.component import *
-from lp.services.worlddata.interfaces.country import *
-from lp.bugs.interfaces.cve import *
-from lp.bugs.interfaces.cvereference import *
-from lp.registry.interfaces.distribution import *
-from lp.registry.interfaces.distributionmirror import *
-from lp.registry.interfaces.distributionsourcepackage import *
-from lp.registry.interfaces.distroseriesdifference import *
-from lp.registry.interfaces.distroseriesdifferencecomment import *
-from lp.soyuz.interfaces.distributionsourcepackagecache import *
-from lp.soyuz.interfaces.distributionsourcepackagerelease import *
-from lp.registry.interfaces.series import *
-from lp.soyuz.interfaces.distroarchseries import *
-from lp.soyuz.interfaces.distroarchseriesbinarypackage import *
-from lp.soyuz.interfaces.distroarchseriesbinarypackagerelease\
-    import *
-from lp.registry.interfaces.distroseries import *
-from lp.soyuz.interfaces.distroseriesbinarypackage import *
-from lp.soyuz.interfaces.distroseriespackagecache import *
-from lp.soyuz.interfaces.distroseriessourcepackagerelease import *
-from canonical.launchpad.interfaces.emailaddress import *
-from lp.registry.interfaces.entitlement import *
-from lp.bugs.interfaces.externalbugtracker import *
-from lp.registry.interfaces.featuredproject import *
-from lp.soyuz.interfaces.files import *
-from lp.registry.interfaces.gpg import *
-from canonical.launchpad.interfaces.gpghandler import *
-from lp.hardwaredb.interfaces.hwdb import *
-from lp.registry.interfaces.irc import *
-from lp.registry.interfaces.jabber import *
-from lp.registry.interfaces.karma import *
-from lp.services.worlddata.interfaces.language import *
-from canonical.launchpad.interfaces.launchpad import *
-from canonical.launchpad.interfaces.launchpadstatistic import *
-from canonical.launchpad.interfaces.librarian import *
-from lp.registry.interfaces.location import *
-from canonical.launchpad.interfaces.logintoken import *
-from canonical.launchpad.interfaces.lpstorm import *
-from canonical.launchpad.interfaces.mail import *
-from canonical.launchpad.interfaces.mailbox import *
-from lp.registry.interfaces.mailinglist import *
-from lp.registry.interfaces.mailinglistsubscription import *
-from canonical.launchpad.interfaces.message import *
-from lp.registry.interfaces.milestone import *
-from canonical.launchpad.interfaces.oauth import *
-from canonical.launchpad.interfaces.openidconsumer import *
-from canonical.launchpad.interfaces.packagerelationship import *
-from canonical.launchpad.interfaces.pathlookup import *
-from lp.registry.interfaces.poll import *
-from lp.soyuz.interfaces.processor import *
-from lp.registry.interfaces.product import *
-from lp.registry.interfaces.productlicense import *
-from lp.registry.interfaces.productrelease import *
-from lp.registry.interfaces.productseries import *
-from lp.registry.interfaces.projectgroup import *
-from lp.soyuz.interfaces.publishing import *
-from lp.soyuz.interfaces.queue import *
-from canonical.launchpad.interfaces.schema import *
-from lp.services.scripts.interfaces.scriptactivity import *
-from lp.soyuz.interfaces.section import *
-from canonical.launchpad.interfaces.searchservice import *
-from lp.registry.interfaces.sourcepackage import *
-from lp.registry.interfaces.sourcepackagename import *
-from lp.soyuz.interfaces.sourcepackagerelease import *
-from lp.blueprints.interfaces.specification import *
-from lp.blueprints.interfaces.specificationbranch import *
-from lp.blueprints.interfaces.specificationbug import *
-from lp.blueprints.interfaces.specificationdependency import *
-from lp.blueprints.interfaces.specificationfeedback import *
-from lp.blueprints.interfaces.specificationsubscription import *
-from lp.services.worlddata.interfaces.spokenin import *
-from lp.blueprints.interfaces.sprint import *
-from lp.blueprints.interfaces.sprintattendance import *
-from lp.blueprints.interfaces.sprintspecification import *
-from lp.registry.interfaces.ssh import *
-from lp.registry.interfaces.structuralsubscription import *
-from lp.registry.interfaces.teammembership import *
-from canonical.launchpad.interfaces.temporaryblobstorage import *
-from lp.registry.interfaces.wikiname import *
-from lp.soyuz.interfaces.packagediff import *
-from lp.soyuz.interfaces.packageset import *
-
-from lp.answers.interfaces.answercontact import *
-from lp.answers.interfaces.faq import *
-from lp.answers.interfaces.faqcollection import *
-from lp.answers.interfaces.faqtarget import *
-from lp.answers.interfaces.question import *
-from lp.coop.answersbugs.interfaces import *
-from lp.answers.interfaces.questioncollection import *
-from lp.answers.interfaces.questionenums import *
-from lp.answers.interfaces.questionmessage import *
-from lp.answers.interfaces.questionreopening import *
-from lp.answers.interfaces.questionsubscription import *
-from lp.answers.interfaces.questiontarget import *
-
-from canonical.launchpad.interfaces._schema_circular_imports import *
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the GNU
+# Affero General Public License version 3 (see the file LICENSE).
+
+"""Interface definitions for bits of Launchpad that don't fit anywhere else.
+
+See also `canonical.launchpad.database` for implementations of these
+interfaces.
+
+DEPRECATED: This package is deprecated.  Do not add any new modules to this
+package.  Where possible, move things out of this package into better
+locations under the 'lp' package.  See the `lp` docstring for more details.
+"""

=== modified file 'lib/lp/bugs/interfaces/__init__.py'
--- lib/lp/bugs/interfaces/__init__.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/interfaces/__init__.py	2010-11-10 10:51:17 +0000
@@ -1,9 +1,4 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# XXX Gavin Panella bug=384831 2009-06-08
-# This ensures that interfaces are loaded in the correct order. Things
-# otherwise break.
-import canonical.launchpad.interfaces
-
 

=== modified file 'lib/lp/code/interfaces/webservice.py'
--- lib/lp/code/interfaces/webservice.py	2010-11-10 10:51:16 +0000
+++ lib/lp/code/interfaces/webservice.py	2010-11-10 10:51:17 +0000
@@ -32,6 +32,29 @@
     'TooManyBuilds',
     ]
 
+__all__ = [
+    'BranchCreatorNotMemberOfOwnerTeam',
+    'BranchCreatorNotOwner',
+    'BranchExists',
+    'BranchMergeProposalExists',
+    'BuildAlreadyPending',
+    'CodeImportAlreadyRunning',
+    'CodeImportNotInReviewedState',
+    'IBranch',
+    'IBranchMergeProposal',
+    'IBranchSet',
+    'IBranchSubscription',
+    'ICodeImport',
+    'ICodeReviewComment',
+    'ICodeReviewVoteReference',
+    'IDiff',
+    'IPreviewDiff',
+    'ISourcePackageRecipe',
+    'ISourcePackageRecipeBuild',
+    'IStaticDiff',
+    'TooManyBuilds',
+    ]
+
 # The exceptions are imported so that they can produce the special
 # status code defined by webservice_error when they are raised.
 from lp.code.errors import (

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-11-02 21:44:42 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-11-10 10:51:17 +0000
@@ -17,6 +17,7 @@
     'CannotSwitchPrivacy',
     'ComponentNotFound',
     'CannotRestrictArchitectures',
+    'CannotUploadToArchive',
     'CannotUploadToPPA',
     'CannotUploadToPocket',
     'DistroSeriesNotFound',

=== modified file 'lib/lp/soyuz/interfaces/webservice.py'
--- lib/lp/soyuz/interfaces/webservice.py	2010-11-10 10:51:16 +0000
+++ lib/lp/soyuz/interfaces/webservice.py	2010-11-10 10:51:17 +0000
@@ -32,9 +32,7 @@
     'IDistroArchSeries',
     'IPackageUpload',
     'IPackageset',
-    'IPackagesetEdit',
     'IPackagesetSet',
-    'IPackagesetViewOnly',
     'ISourcePackagePublishingHistory',
     'IncompatibleArguments',
     'InsufficientUploadRights',
@@ -89,8 +87,6 @@
 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeries
 from lp.soyuz.interfaces.packageset import (
     DuplicatePackagesetName,
-    IPackagesetViewOnly,
-    IPackagesetEdit,
     IPackageset,
     IPackagesetSet,
     NoSuchPackageSet,