Merge lp:~stevenk/launchpad/workitems-delete-series into lp:launchpad

[Steve Kowalik]

Clean up ProductSeries and Milestone deletion to not be so OOPS-friendly when faced with deleted workitems or invisible specifications.

This branch is sadly now misnamed, since it has grown in scope quite a bit.

ProductSeries and Milestone deletion would not handle a specification that was invisible to the currently logged in user, which would lead to an OOPS in the milestone case, or a specification targeted to the now obsolete-junk series in the series case.

Worse, workitems were not handled at all in the milestone case, which makes deleting a milestone that contained workitems fraught with peril, since the code might miss a workitem, and then you get an easily reproduced OOPS.

IHasSpecifications._all_specifications has been renamed to visible_specifications since it filters by the current logged in user via ILaunchBag, and left exported as all_specifications.

IMilestone and IProductSeries have grown a all_specifications property which returns all specifications, irregardless if the current logged in user can see them or not.

I have performed a little bit of clean-up, but not enough to force this branch to be net-negative.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/_schema_circular_imports.py'
--- lib/lp/_schema_circular_imports.py	2013-02-05 22:56:33 +0000
+++ lib/lp/_schema_circular_imports.py	2013-04-03 04:02:25 +0000
@@ -734,7 +734,7 @@
 
 # IHasSpecifications
 patch_collection_property(
-    IHasSpecifications, '_all_specifications', ISpecification)
+    IHasSpecifications, 'visible_specifications', ISpecification)
 patch_collection_property(
     IHasSpecifications, '_valid_specifications', ISpecification)
 

=== modified file 'lib/lp/blueprints/browser/specificationtarget.py'
--- lib/lp/blueprints/browser/specificationtarget.py	2013-01-22 05:07:31 +0000
+++ lib/lp/blueprints/browser/specificationtarget.py	2013-04-03 04:02:25 +0000
@@ -259,7 +259,7 @@
 
     @cachedproperty
     def has_any_specifications(self):
-        return not self.context._all_specifications.is_empty()
+        return not self.context.visible_specifications.is_empty()
 
     @cachedproperty
     def all_specifications(self):

=== modified file 'lib/lp/blueprints/doc/specification.txt'
--- lib/lp/blueprints/doc/specification.txt	2013-01-25 03:30:08 +0000
+++ lib/lp/blueprints/doc/specification.txt	2013-04-03 04:02:25 +0000
@@ -99,9 +99,6 @@
 
 SpecificationSet implements the ISpecificationSet interface
 
-    >>> ubuspec in specset._all_specifications
-    True
-
     >>> from lp.testing import verifyObject
     >>> verifyObject(ISpecificationSet, specset)
     True

=== modified file 'lib/lp/blueprints/interfaces/specification.py'
--- lib/lp/blueprints/interfaces/specification.py	2013-01-25 03:30:08 +0000
+++ lib/lp/blueprints/interfaces/specification.py	2013-04-03 04:02:25 +0000
@@ -698,9 +698,6 @@
         :return: A list of tuples containing (status_id, count).
         """
 
-    def __iter__():
-        """Iterate over all specifications."""
-
     def getByURL(url):
         """Return the specification with the given url."""
 

=== modified file 'lib/lp/blueprints/interfaces/specificationtarget.py'
--- lib/lp/blueprints/interfaces/specificationtarget.py	2013-01-07 02:40:55 +0000
+++ lib/lp/blueprints/interfaces/specificationtarget.py	2013-04-03 04:02:25 +0000
@@ -37,7 +37,7 @@
     associated with them, and you can use this interface to query those.
     """
 
-    _all_specifications = exported(doNotSnapshot(
+    visible_specifications = exported(doNotSnapshot(
         CollectionField(
             title=_("All specifications"),
             value_type=Reference(schema=Interface),  # ISpecification, really.

=== modified file 'lib/lp/blueprints/model/specification.py'
--- lib/lp/blueprints/model/specification.py	2013-01-30 05:31:20 +0000
+++ lib/lp/blueprints/model/specification.py	2013-04-03 04:02:25 +0000
@@ -968,7 +968,7 @@
             return (Desc(Specification.datecreated), Specification.id)
 
     @property
-    def _all_specifications(self):
+    def visible_specifications(self):
         """See IHasSpecifications."""
         user = getUtility(ILaunchBag).user
         return self.specifications(user, filter=[SpecificationFilter.ALL])
@@ -1013,14 +1013,6 @@
         cur.execute(query)
         return cur.fetchall()
 
-    @property
-    def _all_specifications(self):
-        return Specification.select()
-
-    def __iter__(self):
-        """See ISpecificationSet."""
-        return iter(self.all_specifications)
-
     def specifications(self, user, sort=None, quantity=None, filter=None,
                        prejoin_people=True):
         from lp.blueprints.model.specificationsearch import (

=== modified file 'lib/lp/blueprints/tests/test_hasspecifications.py'
--- lib/lp/blueprints/tests/test_hasspecifications.py	2013-01-22 05:07:31 +0000
+++ lib/lp/blueprints/tests/test_hasspecifications.py	2013-04-03 04:02:25 +0000
@@ -25,7 +25,7 @@
         self.factory.makeSpecification(product=product, name="spec1")
         self.factory.makeSpecification(product=product, name="spec2")
         self.assertNamesOfSpecificationsAre(
-            ["spec1", "spec2"], product._all_specifications)
+            ["spec1", "spec2"], product.visible_specifications)
 
     def test_product_valid_specifications(self):
         product = self.factory.makeProduct()
@@ -43,7 +43,7 @@
         self.factory.makeSpecification(
             distribution=distribution, name="spec2")
         self.assertNamesOfSpecificationsAre(
-            ["spec1", "spec2"], distribution._all_specifications)
+            ["spec1", "spec2"], distribution.visible_specifications)
 
     def test_distribution_valid_specifications(self):
         distribution = self.factory.makeDistribution()
@@ -67,8 +67,7 @@
         self.factory.makeSpecification(
             distribution=distribution, name="spec3")
         self.assertNamesOfSpecificationsAre(
-            ["spec1", "spec2"],
-            distroseries._all_specifications)
+            ["spec1", "spec2"], distroseries.visible_specifications)
 
     # XXX: salgado, 2010-11-25, bug=681432: Test disabled because
     # DistroSeries._valid_specifications is broken.
@@ -101,7 +100,7 @@
             product=product, name="spec2", goal=productseries)
         self.factory.makeSpecification(product=product, name="spec3")
         self.assertNamesOfSpecificationsAre(
-            ["spec1", "spec2"], productseries._all_specifications)
+            ["spec1", "spec2"], productseries.visible_specifications)
 
     def test_productseries_valid_specifications(self):
         product = self.factory.makeProduct()
@@ -132,8 +131,7 @@
         self.factory.makeSpecification(
             product=product3, name="spec3")
         self.assertNamesOfSpecificationsAre(
-            ["spec1", "spec2"],
-            projectgroup._all_specifications)
+            ["spec1", "spec2"], projectgroup.visible_specifications)
 
     def test_projectgroup_valid_specifications(self):
         projectgroup = self.factory.makeProject()
@@ -160,7 +158,7 @@
         self.factory.makeSpecification(
             product=product, name="spec3")
         self.assertNamesOfSpecificationsAre(
-            ["spec1", "spec2"], person._all_specifications)
+            ["spec1", "spec2"], person.visible_specifications)
 
     def test_person_valid_specifications(self):
         person = self.factory.makePerson(name="james-w")

=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
--- lib/lp/bugs/model/tests/test_bugtask.py	2013-02-21 06:29:24 +0000
+++ lib/lp/bugs/model/tests/test_bugtask.py	2013-04-03 04:02:25 +0000
@@ -27,7 +27,6 @@
     ServiceUsage,
     )
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
-from lp.blueprints.interfaces.specification import ISpecificationSet
 from lp.bugs.interfaces.bug import (
     CreateBugParams,
     IBug,
@@ -505,7 +504,7 @@
             ' has_specification: False'])
 
         # a specification gets linked...
-        spec = getUtility(ISpecificationSet)._all_specifications[0]
+        spec = self.factory.makeSpecification()
         spec.linkBug(bug_two)
 
         # or a branch gets linked to the bug...

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2012-10-19 14:22:36 +0000
+++ lib/lp/registry/browser/__init__.py	2013-04-03 04:02:25 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Common registry browser helpers and mixins."""
@@ -30,11 +30,11 @@
     LaunchpadEditFormView,
     )
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
+from lp.blueprints.model.specificationworkitem import SpecificationWorkItem
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from lp.bugs.interfaces.bugtasksearch import BugTaskSearchParams
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.series import SeriesStatus
-from lp.services.webapp.interfaces import ILaunchBag
 from lp.services.webapp.publisher import (
     canonical_url,
     DataDownloadView,
@@ -171,14 +171,6 @@
         bugtasks = getUtility(IBugTaskSet).search(params)
         return list(bugtasks)
 
-    def _getSpecifications(self, target):
-        """Return the list `ISpecification`s associated to the target."""
-        if IProductSeries.providedBy(target):
-            return list(target._all_specifications)
-        else:
-            user = getUtility(ILaunchBag).user
-            return list(target.getSpecifications(user))
-
     def _getProductRelease(self, milestone):
         """The `IProductRelease` associated with the milestone."""
         return milestone.product_release
@@ -200,9 +192,11 @@
             subscription.delete()
 
     def _remove_series_bugs_and_specifications(self, series):
-        """Untarget the associated bugs and subscriptions."""
-        for spec in self._getSpecifications(series):
-            spec.proposeGoal(None, self.user)
+        """Untarget the associated bugs and specifications."""
+        for spec in series.all_specifications:
+            # The logged in user may have no permission to see the spec, so
+            # make use of removeSecurityProxy to force it.
+            removeSecurityProxy(spec).proposeGoal(None, self.user)
         for bugtask in self._getBugtasks(series):
             # Bugtasks cannot be deleted directly. In this case, the bugtask
             # is already reported on the product, so the series bugtask has
@@ -246,8 +240,10 @@
                 Store.of(bugtask).remove(nb.conjoined_master)
             else:
                 nb.milestone = None
-        for spec in self._getSpecifications(milestone):
-            spec.milestone = None
+        removeSecurityProxy(milestone.all_specifications).set(milestoneID=None)
+        Store.of(milestone).find(
+            SpecificationWorkItem, milestone_id=milestone.id).set(
+                milestone_id=None)
         self._deleteRelease(milestone.product_release)
         milestone.destroySelf()
 

=== modified file 'lib/lp/registry/browser/milestone.py'
--- lib/lp/registry/browser/milestone.py	2013-03-26 02:56:48 +0000
+++ lib/lp/registry/browser/milestone.py	2013-04-03 04:02:25 +0000
@@ -569,7 +569,7 @@
     @cachedproperty
     def specifications(self):
         """The list `ISpecification`s targeted to the milestone."""
-        return self._getSpecifications(self.context)
+        return self.context.getSpecifications(self.user)
 
     @cachedproperty
     def product_release(self):

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2012-11-26 08:40:20 +0000
+++ lib/lp/registry/browser/productseries.py	2013-04-03 04:02:25 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """View classes for `IProductSeries`."""
@@ -696,9 +696,9 @@
     @cachedproperty
     def specifications(self):
         """A list of all `ISpecification`s targeted to this series."""
-        all_specifications = self._getSpecifications(self.context)
+        all_specifications = list(self.context.visible_specifications)
         for milestone in self.milestones:
-            all_specifications.extend(self._getSpecifications(milestone))
+            all_specifications.extend(milestone.getSpecifications(self.user))
         return all_specifications
 
     @cachedproperty

=== modified file 'lib/lp/registry/browser/tests/test_milestone.py'
--- lib/lp/registry/browser/tests/test_milestone.py	2013-03-25 05:53:38 +0000
+++ lib/lp/registry/browser/tests/test_milestone.py	2013-04-03 04:02:25 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 import soupmatchers
+from storm.store import Store
 from testtools.matchers import LessThan
 from zope.component import getUtility
 
@@ -309,6 +310,36 @@
             BugTaskSearchParams(user=None))
         self.assertEqual(0, tasks.count())
 
+    def test_delete_milestone_with_deleted_workitems(self):
+        milestone = self.factory.makeMilestone()
+        specification = self.factory.makeSpecification(
+            product=milestone.product)
+        workitem = self.factory.makeSpecificationWorkItem(
+            specification=specification, milestone=milestone, deleted=True)
+        form = {'field.actions.delete': 'Delete Milestone'}
+        owner = milestone.product.owner
+        with person_logged_in(owner):
+            view = create_initialized_view(milestone, '+delete', form=form)
+        Store.of(workitem).flush()    
+        self.assertEqual([], view.errors)
+        self.assertIs(None, workitem.milestone)
+
+    def test_delete_milestone_with_private_specification(self):
+        policy = SpecificationSharingPolicy.PROPRIETARY
+        product = self.factory.makeProduct(specification_sharing_policy=policy)
+        milestone = self.factory.makeMilestone(product=product)
+        specification = self.factory.makeSpecification(
+            information_type=InformationType.PROPRIETARY, milestone=milestone)
+        ap = getUtility(IAccessPolicySource).find(
+            [(product, InformationType.PROPRIETARY)])
+        getUtility(IAccessPolicyGrantSource).revokeByPolicy(ap)
+        form = {'field.actions.delete': 'Delete Milestone'}
+        with person_logged_in(product.owner):
+            view = create_initialized_view(milestone, '+delete', form=form)
+        Store.of(specification).flush()    
+        self.assertEqual([], view.errors)
+        self.assertIs(None, specification.milestone)
+
 
 class TestQueryCountBase(TestCaseWithFactory):
 

=== modified file 'lib/lp/registry/browser/tests/test_productseries_views.py'
--- lib/lp/registry/browser/tests/test_productseries_views.py	2012-10-18 17:16:49 +0000
+++ lib/lp/registry/browser/tests/test_productseries_views.py	2013-04-03 04:02:25 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2011-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """View tests for ProductSeries pages."""
@@ -104,9 +104,9 @@
         """The displayed branch name should include the unique name."""
         branch = self.factory.makeProductBranch()
         series = self.factory.makeProductSeries(branch=branch)
-        tag = soupmatchers.Tag('series-branch', 'a',
-                               attrs={'id': 'series-branch'},
-                               text='lp://dev/' + branch.unique_name)
+        tag = soupmatchers.Tag(
+            'series-branch', 'a', attrs={'id': 'series-branch'},
+            text='lp://dev/' + branch.unique_name)
         browser = self.getViewBrowser(series)
         self.assertThat(browser.contents, soupmatchers.HTMLContains(tag))
 
@@ -121,8 +121,8 @@
             information_type=InformationType.PROPRIETARY)
         productseries = self.factory.makeProductSeries(product=product)
         ubuntu_series = self.factory.makeUbuntuDistroSeries()
-        sp = self.factory.makeSourcePackage(distroseries=ubuntu_series,
-                                            publish=True)
+        sp = self.factory.makeSourcePackage(
+            distroseries=ubuntu_series, publish=True)
         browser = self.getBrowser(productseries, '+ubuntupkg')
         browser.getControl('Source Package Name').value = (
             sp.sourcepackagename.name)
@@ -156,11 +156,9 @@
         series = self.factory.makeProductSeries(product=product)
         for status in BugTaskStatusSearch.items:
             self.factory.makeBug(
-                series=series, status=status,
-                owner=product.owner)
+                series=series, status=status, owner=product.owner)
         self.factory.makeBug(
-            series=series, status=BugTaskStatus.UNKNOWN,
-            owner=product.owner)
+            series=series, status=BugTaskStatus.UNKNOWN, owner=product.owner)
         expected = [
             (BugTaskStatus.NEW, 1),
             (BugTaskStatusSearch.INCOMPLETE_WITH_RESPONSE, 1),
@@ -177,8 +175,7 @@
             (BugTaskStatus.INPROGRESS, 1),
             (BugTaskStatus.FIXCOMMITTED, 1),
             (BugTaskStatus.FIXRELEASED, 1),
-            (BugTaskStatus.UNKNOWN, 1),
-            ]
+            (BugTaskStatus.UNKNOWN, 1)]
         with person_logged_in(product.owner):
             view = create_initialized_view(series, '+status')
             observed = [

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2013-03-12 03:18:18 +0000
+++ lib/lp/registry/configure.zcml	2013-04-03 04:02:25 +0000
@@ -1055,6 +1055,7 @@
                 productseries
                 series_target
                 summary
+                all_specifications
                 "/>
         <require
             permission="launchpad.LimitedView"
@@ -1458,7 +1459,7 @@
         <require
             permission="launchpad.View"
             attributes="
-                _all_specifications
+                visible_specifications
                 _valid_specifications
                 getAllowedSpecificationInformationTypes
                 getDefaultSpecificationInformationType

=== modified file 'lib/lp/registry/doc/milestone.txt'
--- lib/lp/registry/doc/milestone.txt	2012-10-19 14:22:36 +0000
+++ lib/lp/registry/doc/milestone.txt	2013-04-03 04:02:25 +0000
@@ -289,7 +289,7 @@
 the Gnome project has yet any specifications.
 
     >>> for product in gnome.products:
-    ...     print product.name, list(product._all_specifications)
+    ...     print product.name, list(product.visible_specifications)
     evolution []
     gnome-terminal []
     applets []
@@ -303,7 +303,7 @@
 milestone, it is "inheritied" by the project milestone.
 
     >>> spec = test_helper.createSpecification('1.1', 'applets')
-    >>> [spec.name for spec in applets._all_specifications]
+    >>> [spec.name for spec in applets.visible_specifications]
     [u'applets-specification']
 
     >>> specs = gnome.getMilestone('1.1').getSpecifications(None)

=== modified file 'lib/lp/registry/doc/projectgroup.txt'
--- lib/lp/registry/doc/projectgroup.txt	2012-12-26 01:32:19 +0000
+++ lib/lp/registry/doc/projectgroup.txt	2013-04-03 04:02:25 +0000
@@ -200,10 +200,10 @@
     >>> firefox.active = True
     >>> flush_database_updates()
 
-We can get all the specifications via the _all_specifications property,
+We can get all the specifications via the visible_specifications property,
 and all valid specifications via the _valid_specifications property:
 
-    >>> for spec in mozilla._all_specifications:
+    >>> for spec in mozilla.visible_specifications:
     ...    print spec.name
     svg-support
     canvas
@@ -238,30 +238,30 @@
     >>> print mozilla.getSeries('nonsense')
     None
 
-IProjectGroupSeries._all_specifications lists all specifications
+IProjectGroupSeries.visible_specifications lists all specifications
 assigned to a series. Currently, no specifications are assigned to the
 Mozilla series 1.0.
 
-    >>> specs = mozilla_series_1_0._all_specifications
+    >>> specs = mozilla_series_1_0.visible_specifications
     >>> specs.count()
     0
 
 If a specification is assigned to series 1.0, it appears in
-mozilla_1_0_series._all_specifications.
+mozilla_1_0_series.visible_specifications.
 
     >>> filter = [SpecificationFilter.INFORMATIONAL]
     >>> extension_manager_upgrades = mozilla.specifications(
     ...     None, filter=filter)[0]
     >>> series_1_0 = firefox.getSeries('1.0')
     >>> extension_manager_upgrades.proposeGoal(series_1_0, no_priv)
-    >>> for spec in mozilla_series_1_0._all_specifications:
+    >>> for spec in mozilla_series_1_0.visible_specifications:
     ...     print spec.name
     extension-manager-upgrades
 
 This specification is not listed for other series.
 
     >>> mozilla_trunk = mozilla.getSeries('trunk')
-    >>> print mozilla_trunk._all_specifications.count()
+    >>> print mozilla_trunk.visible_specifications.count()
     0
 
 Filtered lists of project series related specifications are generated
@@ -273,7 +273,7 @@
 
 If all existing specifications are assigned to the 1.0 series,...
 
-    >>> for spec in mozilla._all_specifications:
+    >>> for spec in mozilla.visible_specifications:
     ...     spec.proposeGoal(series_1_0, no_priv)
 
 we have the save five incomplete specs in the series 1.0 as we have for the
@@ -312,10 +312,10 @@
 
     >>> firefox.active = True
 
-We can get all the specifications via the _all_specifications property,
+We can get all the specifications via the visible_specifications property,
 and all valid specifications via the _valid_specifications property:
 
-    >>> for spec in mozilla_series_1_0._all_specifications:
+    >>> for spec in mozilla_series_1_0.visible_specifications:
     ...    print spec.name
     svg-support
     canvas

=== modified file 'lib/lp/registry/interfaces/milestone.py'
--- lib/lp/registry/interfaces/milestone.py	2013-01-07 02:40:55 +0000
+++ lib/lp/registry/interfaces/milestone.py	2013-04-03 04:02:25 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Milestone interfaces."""
@@ -135,6 +135,8 @@
     title = exported(
         TextLine(title=_("A context title for pages."),
                  readonly=True))
+    all_specifications = doNotSnapshot(
+        Attribute('All specifications linked to this milestone.'))
 
     def bugtasks(user):
         """Get a list of non-conjoined bugtasks visible to this user."""

=== modified file 'lib/lp/registry/interfaces/productseries.py'
--- lib/lp/registry/interfaces/productseries.py	2013-01-07 02:40:55 +0000
+++ lib/lp/registry/interfaces/productseries.py	2013-04-03 04:02:25 +0000
@@ -168,9 +168,7 @@
     parent = Attribute('The structural parent of this series - the product')
 
     datecreated = exported(
-        Datetime(title=_('Date Registered'),
-                 required=True,
-                 readonly=True),
+        Datetime(title=_('Date Registered'), required=True, readonly=True),
         exported_as='date_created')
 
     owner = exported(
@@ -239,10 +237,8 @@
 
     branch = exported(
         ReferenceChoice(
-            title=_('Branch'),
-            vocabulary='BranchRestrictedOnProduct',
-            schema=IBranch,
-            required=False,
+            title=_('Branch'), vocabulary='BranchRestrictedOnProduct',
+            schema=IBranch, required=False,
             description=_("The Bazaar branch for this series.  Leave blank "
                           "if this series is not maintained in Bazaar.")))
 
@@ -269,6 +265,9 @@
             "A Bazaar branch to commit translation snapshots to.  "
             "Leave blank to disable."))
 
+    all_specifications = doNotSnapshot(
+        Attribute('All specifications linked to this series.'))
+
     def getCachedReleases():
         """Gets a cached copy of this series' releases.
 

=== modified file 'lib/lp/registry/model/milestone.py'
--- lib/lp/registry/model/milestone.py	2013-03-25 05:53:38 +0000
+++ lib/lp/registry/model/milestone.py	2013-04-03 04:02:25 +0000
@@ -15,6 +15,7 @@
 
 import datetime
 import httplib
+from operator import itemgetter
 
 from lazr.restful.declarations import error_status
 from sqlobject import (
@@ -67,7 +68,6 @@
 from lp.services.database.lpstorm import IStore
 from lp.services.database.sqlbase import SQLBase
 from lp.services.propertycache import get_property_cache
-from lp.services.webapp.interfaces import ILaunchBag
 from lp.services.webapp.sorting import expand_numbers
 
 
@@ -159,6 +159,11 @@
     def title(self):
         raise NotImplementedError
 
+    @property
+    def all_specifications(self):
+        return Store.of(self).find(
+            Specification, Specification.milestoneID == self.id)
+
     def getSpecifications(self, user):
         """See `IMilestoneData`"""
         from lp.registry.model.person import Person
@@ -186,13 +191,11 @@
                             SpecificationWorkItem.deleted == False)),
                     all=True)),
             *clauses)
-        ordered_results = results.order_by(Desc(Specification.priority),
-                                           Specification.definition_status,
-                                           Specification.implementation_status,
-                                           Specification.title)
+        ordered_results = results.order_by(
+            Desc(Specification.priority), Specification.definition_status,
+            Specification.implementation_status, Specification.title)
         ordered_results.config(distinct=True)
-        mapper = lambda row: row[0]
-        return DecoratedResultSet(ordered_results, mapper)
+        return DecoratedResultSet(ordered_results, itemgetter(0))
 
     def bugtasks(self, user):
         """The list of non-conjoined bugtasks targeted to this milestone."""
@@ -307,14 +310,13 @@
         params = BugTaskSearchParams(milestone=self, user=None)
         bugtasks = getUtility(IBugTaskSet).search(params)
         subscriptions = IResultSet(self.getSubscriptions())
-        user = getUtility(ILaunchBag).user
         assert subscriptions.is_empty(), (
             "You cannot delete a milestone which has structural "
             "subscriptions.")
-        assert bugtasks.count() == 0, (
+        assert bugtasks.is_empty(), (
             "You cannot delete a milestone which has bugtasks targeted "
             "to it.")
-        assert self.getSpecifications(user).count() == 0, (
+        assert self.all_specifications.is_empty(), (
             "You cannot delete a milestone which has specifications targeted "
             "to it.")
         assert self.product_release is None, (

=== modified file 'lib/lp/registry/model/productseries.py'
--- lib/lp/registry/model/productseries.py	2013-01-22 05:07:31 +0000
+++ lib/lp/registry/model/productseries.py	2013-04-03 04:02:25 +0000
@@ -332,6 +332,11 @@
             self, base_clauses, user, sort, quantity, filter, prejoin_people,
             default_acceptance=True)
 
+    @property
+    def all_specifications(self):
+        return Store.of(self).find(
+            Specification, Specification.productseriesID == self.id)
+
     def _customizeSearchParams(self, search_params):
         """Customize `search_params` for this product series."""
         search_params.setProductSeries(self)

=== modified file 'lib/lp/registry/tests/test_product.py'
--- lib/lp/registry/tests/test_product.py	2013-02-13 03:50:06 +0000
+++ lib/lp/registry/tests/test_product.py	2013-04-03 04:02:25 +0000
@@ -812,7 +812,7 @@
             'official_blueprints', 'official_codehosting', 'official_malone',
             'owner', 'parent_subscription_target', 'project', 'title', )),
         'launchpad.View': set((
-            '_getOfficialTagClause', '_all_specifications',
+            '_getOfficialTagClause', 'visible_specifications',
             '_valid_specifications', 'active_or_packaged_series',
             'aliases', 'all_milestones',
             'allowsTranslationEdits', 'allowsTranslationSuggestions',

=== modified file 'lib/lp/registry/tests/test_productseries.py'
--- lib/lp/registry/tests/test_productseries.py	2012-12-05 09:55:39 +0000
+++ lib/lp/registry/tests/test_productseries.py	2013-04-03 04:02:25 +0000
@@ -626,7 +626,7 @@
             'bugtargetdisplayname', 'bugtarget_parent', 'name',
             'parent_subscription_target', 'product', 'productID', 'series')),
         'launchpad.View': set((
-            '_all_specifications', '_getOfficialTagClause',
+            'visible_specifications', '_getOfficialTagClause',
             '_valid_specifications', 'active', 'all_milestones',
             'answers_usage', 'blueprints_usage', 'branch',
             'bug_reported_acknowledgement', 'bug_reporting_guidelines',