Launchpad itself

Merge lp:~edwin-grubbs/launchpad/bug-562486-pending-gpg-keys into lp:launchpad

  1. bug-562486-pending-gpg-keys
  2. Merge into devel
Proposed by Edwin Grubbs
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 10852
Proposed branch: lp:~edwin-grubbs/launchpad/bug-562486-pending-gpg-keys
Merge into: lp:launchpad
Diff against target: 39 lines (+4/-7)
2 files modified
lib/lp/registry/interfaces/person.py (+4/-5)
lib/lp/registry/stories/webservice/xx-person.txt (+0/-2)
To merge this branch: bzr merge lp:~edwin-grubbs/launchpad/bug-562486-pending-gpg-keys
Reviewer Review Type Date Requested Status
Curtis Hovey (community) Approve
Review via email: mp+25154@code.launchpad.net

Description of the change

Summary
-------

Unexported IPerson.pending_gpg_keys, since it is not really useful,
and it was causing some strange errors.

Tests
-----

./bin/test -vv -t 'webservice/xx-person.txt|gpg-views.txt'

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thanks for the lovely fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py 2010-04-29 23:06:26 +0000
+++ lib/lp/registry/interfaces/person.py 2010-05-12 14:15:42 +0000
@@ -611,11 +611,10 @@
611 title=_("List of valid OpenPGP keys ordered by ID"),611 title=_("List of valid OpenPGP keys ordered by ID"),
612 readonly=False, required=False,612 readonly=False, required=False,
613 value_type=Reference(schema=IGPGKey)))613 value_type=Reference(schema=IGPGKey)))
614 pending_gpg_keys = exported(614 pending_gpg_keys = CollectionField(
615 CollectionField(615 title=_("Set of fingerprints pending confirmation"),
616 title=_("Set of fingerprints pending confirmation"),616 readonly=False, required=False,
617 readonly=False, required=False,617 value_type=Reference(schema=IGPGKey))
618 value_type=Reference(schema=IGPGKey)))
619 inactive_gpg_keys = Attribute(618 inactive_gpg_keys = Attribute(
620 "List of inactive OpenPGP keys in LP Context, ordered by ID")619 "List of inactive OpenPGP keys in LP Context, ordered by ID")
621 wiki_names = exported(620 wiki_names = exported(
622621
=== modified file 'lib/lp/registry/stories/webservice/xx-person.txt'
--- lib/lp/registry/stories/webservice/xx-person.txt 2010-04-27 11:48:16 +0000
+++ lib/lp/registry/stories/webservice/xx-person.txt 2010-05-12 14:15:42 +0000
@@ -39,7 +39,6 @@
39 name: u'salgado'39 name: u'salgado'
40 open_membership_invitations_collection_link: u'http://.../~salgado/open_membership_invitations'40 open_membership_invitations_collection_link: u'http://.../~salgado/open_membership_invitations'
41 participants_collection_link: u'http://.../~salgado/participants'41 participants_collection_link: u'http://.../~salgado/participants'
42 pending_gpg_keys_collection_link: u'http://.../~salgado/pending_gpg_keys'
43 ppas_collection_link: u'http://.../~salgado/ppas'42 ppas_collection_link: u'http://.../~salgado/ppas'
44 preferred_email_address_link: u'http://.../~salgado/+email/guilherme.salgado@canonical.com'43 preferred_email_address_link: u'http://.../~salgado/+email/guilherme.salgado@canonical.com'
45 private: False44 private: False
@@ -89,7 +88,6 @@
89 name: u'ubuntu-team'88 name: u'ubuntu-team'
90 open_membership_invitations_collection_link: u'http://.../~ubuntu-team/open_membership_invitations'89 open_membership_invitations_collection_link: u'http://.../~ubuntu-team/open_membership_invitations'
91 participants_collection_link: u'http://.../~ubuntu-team/participants'90 participants_collection_link: u'http://.../~ubuntu-team/participants'
92 pending_gpg_keys_collection_link: u'http://.../~ubuntu-team/pending_gpg_keys'
93 ppas_collection_link: u'http://.../~ubuntu-team/ppas'91 ppas_collection_link: u'http://.../~ubuntu-team/ppas'
94 preferred_email_address_link: u'http://.../~ubuntu-team/+email/support@ubuntu.com'92 preferred_email_address_link: u'http://.../~ubuntu-team/+email/support@ubuntu.com'
95 private: False93 private: False