← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~gmb/launchpad/bug-999554 into lp:launchpad

 

Graham Binns has proposed merging lp:~gmb/launchpad/bug-999554 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~gmb/launchpad/bug-999554/+merge/105944

This branch fixes bug 999554 by adding an ID field to the Specification export in $sprint/+temp-meeting-export.

I've added a test to cover the change (that view is not very well tested) and removed some unused imports to offset the LoC change a bit.
-- 
https://code.launchpad.net/~gmb/launchpad/bug-999554/+merge/105944
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gmb/launchpad/bug-999554 into lp:launchpad.
=== modified file 'lib/lp/blueprints/interfaces/webservice.py'
--- lib/lp/blueprints/interfaces/webservice.py	2011-12-22 16:19:11 +0000
+++ lib/lp/blueprints/interfaces/webservice.py	2012-05-16 09:21:21 +0000
@@ -23,7 +23,6 @@
 from lp.blueprints.interfaces.specificationsubscription import (
     ISpecificationSubscription,
     )
-from lp.blueprints.interfaces.specificationtarget import ISpecificationTarget
 
 
 _schema_circular_imports

=== modified file 'lib/lp/blueprints/stories/sprints/xx-sprint-meeting-export.txt'
--- lib/lp/blueprints/stories/sprints/xx-sprint-meeting-export.txt	2009-05-11 18:19:21 +0000
+++ lib/lp/blueprints/stories/sprints/xx-sprint-meeting-export.txt	2012-05-16 09:21:21 +0000
@@ -38,3 +38,12 @@
     ...     print "%(displayname)s, %(name)s, %(start)s -> %(end)s" % person
     Celso Providelo, cprov, 2005-10-07T23:30:00Z -> 2005-11-17T00:11:00Z
     Foo Bar, name16, 2005-10-07T23:30:00Z -> 2005-11-17T00:11:00Z
+
+The <unscheduled /> element contains a list of meetings. Each of these
+actually refers to a Specification.
+
+    >>> soup = BSS(browser.contents)
+    >>> meetings = soup.find('unscheduled').findAll('meeting')
+    >>> for meeting in meetings:
+    ...     print "%(id)s: %(name)s, %(lpurl)s" % meeting
+    1: extension-manager-upgrades, .../+spec/extension-manager-upgrades

=== modified file 'lib/lp/blueprints/templates/sprint-meeting-export.pt'
--- lib/lp/blueprints/templates/sprint-meeting-export.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprint-meeting-export.pt	2012-05-16 09:21:21 +0000
@@ -15,7 +15,8 @@
 
   <unscheduled>
     <meeting tal:repeat="spec view/specifications"
-             tal:attributes="name spec/spec/name;
+             tal:attributes="id spec/spec/id;
+                             name spec/spec/name;
                              status spec/spec/definition_status/name;
                              lpurl spec/spec/fmt:url;
                              specurl spec/spec/specurl;

=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py	2012-05-03 01:14:29 +0000
+++ lib/lp/bugs/model/tests/test_bug.py	2012-05-16 09:21:21 +0000
@@ -8,7 +8,6 @@
     timedelta,
     )
 
-from lazr.lifecycle.interfaces import IObjectModifiedEvent
 from pytz import UTC
 from storm.expr import Join
 from storm.store import Store
@@ -23,7 +22,6 @@
     BugNotificationStatus,
     )
 from lp.bugs.errors import BugCannotBePrivate
-from lp.bugs.interfaces.bug import IBug
 from lp.bugs.interfaces.bugnotification import IBugNotificationSet
 from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.bugs.mail.bugnotificationrecipients import BugNotificationRecipients
@@ -43,7 +41,6 @@
     StormStatementRecorder,
     TestCaseWithFactory,
     )
-from lp.testing.event import TestEventListener
 from lp.testing.layers import DatabaseFunctionalLayer
 from lp.testing.matchers import (
     Equals,


Follow ups