launchpad-reviewers team mailing list archive

[Jonathan Lange <jml@xxxxxxxxx>]

Jonathan Lange has proposed merging lp:~jml/launchpad/patmos-2 into lp:launchpad/devel with lp:~jml/launchpad/patmos-1 as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


This branch changes the webservice registration to be explicit for all objects, thus removing another thing that depends on the c.l.interfaces globs.
-- 
https://code.launchpad.net/~jml/launchpad/patmos-2/+merge/40396
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jml/launchpad/patmos-2 into lp:launchpad/devel.

=== added file 'lib/canonical/launchpad/interfaces/webservice.py'
--- lib/canonical/launchpad/interfaces/webservice.py	1970-01-01 00:00:00 +0000
+++ lib/canonical/launchpad/interfaces/webservice.py	2010-11-09 00:19:52 +0000
@@ -0,0 +1,22 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""All the interfaces that are exposed through the webservice."""
+
+__metaclass__ = type
+__all__ = [
+    'IEmailAddress',
+    'IMessage',
+    'ITemporaryBlobStorage',
+    'ITemporaryStorageManager',
+    'IWebServiceApplication',
+    ]
+
+from canonical.launchpad.interfaces.launchpad import IWebServiceApplication
+
+from canonical.launchpad.interfaces.emailaddress import IEmailAddress
+from canonical.launchpad.interfaces.message import IMessage
+from canonical.launchpad.interfaces.temporaryblogstorage import (
+    ITemporaryBlobStorage,
+    ITemporaryStorageManager,
+    )

=== modified file 'lib/canonical/launchpad/zcml/webservice.zcml'
--- lib/canonical/launchpad/zcml/webservice.zcml	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/zcml/webservice.zcml	2010-11-09 00:19:52 +0000
@@ -36,10 +36,10 @@
         for="lazr.restful.interfaces.IEntry
              zope.schema.interfaces.IField"
         provides="lazr.restful.interfaces.IByteStorage"
-        factory="canonical.launchpad.rest.LibraryBackedByteStorage"
+        factory="canonical.launchpad.rest.bytestorage.LibraryBackedByteStorage"
         />
 
-    <class class="canonical.launchpad.rest.LibraryBackedByteStorage">
+    <class class="canonical.launchpad.rest.bytestorage.LibraryBackedByteStorage">
         <allow interface='lazr.restful.interfaces.IByteStorage' />
     </class>
 
@@ -49,10 +49,10 @@
         for="lazr.restful.interfaces.IEntry
              lp.services.fields.IRestrictedBytes"
         provides="lazr.restful.interfaces.IByteStorage"
-        factory="canonical.launchpad.rest.RestrictedLibraryBackedByteStorage"
+        factory="canonical.launchpad.rest.bytestorage.RestrictedLibraryBackedByteStorage"
         />
 
-    <class class="canonical.launchpad.rest.RestrictedLibraryBackedByteStorage">
+    <class class="canonical.launchpad.rest.bytestorage.RestrictedLibraryBackedByteStorage">
         <allow interface='lazr.restful.interfaces.IByteStorage' />
     </class>
 
@@ -68,13 +68,19 @@
         for="lp.bugs.interfaces.bugmessage.IBugComment
              lazr.restful.interfaces.IWebServiceClientRequest"
         provides="lazr.restful.interfaces.IEntry"
-        factory="canonical.launchpad.rest.bugcomment_to_entry"
+        factory="lp.bugs.adapters.bug.bugcomment_to_entry"
         />
 
    <grok:grok package="lazr.restful.directives" />
    <grok:grok package="canonical.launchpad.rest" />
 
+   <!-- This section should be revisited once all of the webservice modules
+        have been created. -->
    <webservice:register module="canonical.launchpad.interfaces" />
+   <webservice:register module="canonical.launchpad.interfaces.webservice" />
+   <webservice:register module="lp.blueprints.interfaces.webservice" />
+   <webservice:register module="lp.hwdb.interfaces.hwdb" />
+   <webservice:register module="lp.services.worlddata.interfaces.webservice" />
 
    <adapter
        for="zope.schema.interfaces.IChoice

=== added file 'lib/lp/blueprints/interfaces/webservice.py'
--- lib/lp/blueprints/interfaces/webservice.py	1970-01-01 00:00:00 +0000
+++ lib/lp/blueprints/interfaces/webservice.py	2010-11-09 00:19:52 +0000
@@ -0,0 +1,12 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""All the interfaces that are exposed through the webservice."""
+
+__all__ = [
+    'ISpecification',
+    'ISpecificationBranch',
+    ]
+
+from lp.blueprints.interfaces.specification import ISpecification
+from lp.blueprints.interfaces.specificationbranch import ISpecificationBranch

=== modified file 'lib/lp/code/interfaces/webservice.py'
--- lib/lp/code/interfaces/webservice.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/interfaces/webservice.py	2010-11-09 00:19:52 +0000
@@ -1,8 +1,31 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """All the interfaces that are exposed through the webservice."""
 
+__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 (

=== added file 'lib/lp/services/worlddata/interfaces/webservice.py'
--- lib/lp/services/worlddata/interfaces/webservice.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/worlddata/interfaces/webservice.py	2010-11-09 00:19:52 +0000
@@ -0,0 +1,21 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""All the interfaces that are exposed through the webservice."""
+
+__metaclass__ = type
+__all__ = [
+    'ICountry',
+    'ICountrySet',
+    'ILanguage',
+    'ILanguageSet',
+    ]
+
+from lp.services.worlddata.interfaces.country import (
+    ICountry,
+    ICountrySet,
+    )
+from lp.services.worlddata.interfaces.language import (
+    ILanguage,
+    ILanguageSet,
+    )