Merge lp:~thumper/launchpad/move-code-events into lp:launchpad

[Tim Penhey]

Move lp-code event interfaces into lp.code.interfaces.event.

A simple branch that just moves four interfaces into lp.code.interfaces.

[Stuart Bishop (stub)]

Fine

review: Approve

=== modified file 'lib/canonical/launchpad/event/interfaces.py'
--- lib/canonical/launchpad/event/interfaces.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/event/interfaces.py	2010-03-17 08:05:41 +0000
@@ -5,13 +5,9 @@
 
 __metaclass__ = type
 __all__ = [
-    'IBranchMergeProposalStatusChangeEvent',
     'IJoinTeamEvent',
     'IKarmaAssignedEvent',
     'IMessageHeldEvent',
-    'INewBranchMergeProposalEvent',
-    'INewCodeReviewCommentEvent',
-    'IReviewerNominatedEvent',
     'ITeamInvitationEvent',
     ]
 
@@ -45,22 +41,3 @@
 
     mailing_list = Attribute('The mailing list the message is held for.')
     message_id = Attribute('The Message-ID of the held message.')
-
-
-class IBranchMergeProposalStatusChangeEvent(IObjectEvent):
-    """A merge proposal has changed state."""
-    user = Attribute("The user who updated the proposal.")
-    from_state = Attribute("The previous queue_status.")
-    to_state = Attribute("The updated queue_status.")
-
-
-class INewBranchMergeProposalEvent(IObjectEvent):
-    """A new merge has been proposed."""
-
-
-class IReviewerNominatedEvent(IObjectEvent):
-    """A reviewer has been nominated."""
-
-
-class INewCodeReviewCommentEvent(IObjectEvent):
-    """A new comment has been added to the merge proposal."""
 
=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-03-05 20:00:56 +0000
+++ lib/lp/code/configure.zcml	2010-03-17 08:05:41 +0000
@@ -37,7 +37,7 @@
   </class>
   <subscriber
       for="lp.code.interfaces.codereviewvote.ICodeReviewVoteReference
-           canonical.launchpad.event.interfaces.IReviewerNominatedEvent"
+           lp.code.interfaces.event.IReviewerNominatedEvent"
       handler="lp.code.mail.branchmergeproposal.send_review_requested_notifications"/>
 
   <!-- CodeImportMachine -->
@@ -279,7 +279,7 @@
   </class>
   <subscriber
       for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal
-           canonical.launchpad.event.interfaces.INewBranchMergeProposalEvent"
+           lp.code.interfaces.event.INewBranchMergeProposalEvent"
       handler="lp.code.mail.branchmergeproposal.send_merge_proposal_created_notifications"/>
   <subscriber
       for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal
@@ -287,11 +287,11 @@
       handler="lp.code.mail.branchmergeproposal.send_merge_proposal_modified_notifications"/>
   <subscriber
       for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal
-           canonical.launchpad.event.interfaces.INewBranchMergeProposalEvent"
+           lp.code.interfaces.event.INewBranchMergeProposalEvent"
       handler="canonical.launchpad.subscribers.karma.branch_merge_proposed"/>
   <subscriber
       for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal
-           canonical.launchpad.event.interfaces.IBranchMergeProposalStatusChangeEvent"
+           lp.code.interfaces.event.IBranchMergeProposalStatusChangeEvent"
       handler="canonical.launchpad.subscribers.karma.branch_merge_status_changed"/>
   <adapter
       for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
@@ -701,11 +701,11 @@
   </class>
   <subscriber
       for="lp.code.interfaces.codereviewcomment.ICodeReviewComment
-           canonical.launchpad.event.interfaces.INewCodeReviewCommentEvent"
+           lp.code.interfaces.event.INewCodeReviewCommentEvent"
       handler="lp.code.mail.codereviewcomment.send"/>
   <subscriber
       for="lp.code.interfaces.codereviewcomment.ICodeReviewComment
-           canonical.launchpad.event.interfaces.INewCodeReviewCommentEvent"
+           lp.code.interfaces.event.INewCodeReviewCommentEvent"
       handler="canonical.launchpad.subscribers.karma.code_review_comment_added"/>
   <adapter
       for="lp.code.interfaces.codereviewcomment.ICodeReviewComment"
 
=== modified file 'lib/lp/code/event/branchmergeproposal.py'
--- lib/lp/code/event/branchmergeproposal.py	2009-06-25 04:06:00 +0000
+++ lib/lp/code/event/branchmergeproposal.py	2010-03-17 08:05:41 +0000
@@ -16,7 +16,7 @@
 from zope.component.interfaces import ObjectEvent
 from zope.interface import implements
 
-from canonical.launchpad.event.interfaces import (
+from lp.code.interfaces.event import (
     IBranchMergeProposalStatusChangeEvent,
     INewBranchMergeProposalEvent,
     INewCodeReviewCommentEvent,
 
=== added file 'lib/lp/code/interfaces/event.py'
--- lib/lp/code/interfaces/event.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/interfaces/event.py	2010-03-17 08:05:41 +0000
@@ -0,0 +1,36 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Interfaces for events used in the launchpad code application."""
+
+__metaclass__ = type
+__all__ = [
+    'IBranchMergeProposalStatusChangeEvent',
+    'INewBranchMergeProposalEvent',
+    'INewCodeReviewCommentEvent',
+    'IReviewerNominatedEvent',
+    ]
+
+
+from zope.component.interfaces import IObjectEvent
+from zope.interface import Attribute
+
+
+class IBranchMergeProposalStatusChangeEvent(IObjectEvent):
+    """A merge proposal has changed state."""
+
+    user = Attribute("The user who updated the proposal.")
+    from_state = Attribute("The previous queue_status.")
+    to_state = Attribute("The updated queue_status.")
+
+
+class INewBranchMergeProposalEvent(IObjectEvent):
+    """A new merge has been proposed."""
+
+
+class IReviewerNominatedEvent(IObjectEvent):
+    """A reviewer has been nominated."""
+
+
+class INewCodeReviewCommentEvent(IObjectEvent):
+    """A new comment has been added to the merge proposal."""