Merge lp:~jml/launchpad/expose-get-owners into lp:launchpad

[Jonathan Lange]

I just found this branch in my area. It looks pretty sensible to me, so I figure it should get reviewed.

jml

[Jonathan Lange (jml)]

From the bug report:

jml says "Note that exposing this method, which should be a very, very simple patch, is actually quite tedious. The method in question returns IPillarName, which is itself not exposed via the API yet"

leonardr replies "You don't need to publish internal Launchpad methods exactly as is. You should be able to define a new method that returns pillar objects (which are already published), and publish that as a named operation."

Also there are conflicts.

review: Needs Fixing

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2010-03-05 14:50:47 +0000
+++ lib/lp/registry/interfaces/person.py	2010-03-11 15:39:31 +0000
@@ -88,6 +88,13 @@
     IHasBranches, IHasMergeProposals, IHasRequestedReviews)
 from lp.registry.interfaces.irc import IIrcID
 from lp.registry.interfaces.jabber import IJabberID
+<<<<<<< TREE
+=======
+from lp.registry.interfaces.pillar import IPillarName
+from lp.services.worlddata.interfaces.language import ILanguage
+from canonical.launchpad.interfaces.launchpad import (
+    IHasIcon, IHasLogo, IHasMugshot, IPrivacy)
+>>>>>>> MERGE-SOURCE
 from lp.registry.interfaces.location import (
     IHasLocation, ILocationRecord, IObjectWithLocation, ISetLocation)
 from lp.registry.interfaces.mailinglistsubscription import (
@@ -956,6 +963,8 @@
                           the icons which represent that category.
         """
 
+    @operation_returns_collection_of(IPillarName)
+    @export_read_operation()
     def getOwnedOrDrivenPillars():
         """Return Distribution, Project Groups and Projects that this person
         owns or drives.

=== modified file 'lib/lp/registry/interfaces/pillar.py'
--- lib/lp/registry/interfaces/pillar.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/interfaces/pillar.py	2010-03-11 15:39:31 +0000
@@ -65,6 +65,9 @@
     This includes the pillar object, as well as information about whether
     it's a project, project group, or distribution.
     """
+
+    export_as_webservice_entry()
+
     id = Int(title=_('The PillarName ID'))
     name = TextLine(title=u"The name.")
     product = Attribute('The project that has this name, or None')

=== modified file 'lib/lp/registry/stories/webservice/xx-person.txt'
--- lib/lp/registry/stories/webservice/xx-person.txt	2010-02-24 16:53:30 +0000
+++ lib/lp/registry/stories/webservice/xx-person.txt	2010-03-11 15:39:31 +0000
@@ -650,3 +650,15 @@
   HTTP/1.1 400 Bad Request
   ...
   team_owner_link: Constraint not satisfied.
+
+
+== Associated pillars ==
+
+A team can own or drive a bunch of projects.
+
+  >>> json = webservice.named_get(
+  ...     '/~name12', 'getOwnedOrDrivenPillars').jsonBody()
+  >>> for entry in json['entries']:
+  ...     print entry
+
+