Merge lp:~jml/launchpad/remove-bounty-bug-418453 into lp:launchpad

[Jonathan Lange]

[Jonathan Lange (jml)]

This branch removes the bounty code from Launchpad. It keeps the bounty subscription code, since it's still needed to do person merges correctly.

[Henning Eggers (henninge)]

Die old code, die!

Although I am not aware of the reasons why bounties had to go but that is besides the point ...

review: Approve (code)

=== modified file 'lib/canonical/launchpad/browser/__init__.py'
--- lib/canonical/launchpad/browser/__init__.py	2009-07-18 00:05:49 +0000
+++ lib/canonical/launchpad/browser/__init__.py	2009-08-28 06:16:16 +0000
@@ -15,8 +15,6 @@
 from lp.soyuz.browser.archive import *
 from lp.code.browser.bazaar import *
 from lp.soyuz.browser.binarypackagerelease import *
-from canonical.launchpad.browser.bounty import *
-from canonical.launchpad.browser.bountysubscription import *
 from lp.code.browser.branchmergeproposal import *
 from lp.code.browser.branchref import *
 from lp.code.browser.branchsubscription import *
@@ -48,7 +46,6 @@
 from canonical.launchpad.browser.logintoken import *
 from lp.registry.browser.mailinglists import *
 from lp.registry.browser.mentoringoffer import *
-from canonical.launchpad.browser.message import *
 from canonical.launchpad.browser.oauth import *
 from canonical.launchpad.browser.objectreassignment import *
 from canonical.launchpad.browser.packagerelationship import *

=== removed file 'lib/canonical/launchpad/browser/bounty.py'
--- lib/canonical/launchpad/browser/bounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/browser/bounty.py	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-__metaclass__ = type
-
-__all__ = [
-    'BountySetNavigation',
-    'BountiesAppMenu',
-    'BountyContextMenu',
-    'BountyView',
-    'BountyLinkView',
-    'BountyEditView',
-    'BountyAddView',
-    'BountySetView'
-    ]
-
-from zope.component import getUtility
-from zope.event import notify
-from zope.lifecycleevent import ObjectCreatedEvent
-from zope.app.form.browser.add import AddView
-from zope.security.interfaces import Unauthorized
-from zope.app.form.browser.editview import EditView
-
-from canonical.launchpad.interfaces import (
-    IBounty, IBountySet, ILaunchBag, IProduct, IProject, IDistribution)
-
-from canonical.launchpad.webapp import (
-    canonical_url, LaunchpadView, ApplicationMenu, ContextMenu, Link,
-    enabled_with_permission, GetitemNavigation)
-
-
-class BountySetNavigation(GetitemNavigation):
-
-    usedfor = IBountySet
-
-
-class BountiesAppMenu(ApplicationMenu):
-    usedfor = IBountySet
-    facet = 'bounties'
-    links = ['new']
-
-    def new(self):
-        text = "Register a bounty"
-        return Link('+new', text, icon="add")
-
-
-class BountyContextMenu(ContextMenu):
-    usedfor = IBounty
-    links = ['edit', 'subscription', 'administer']
-
-    def edit(self):
-        text = 'Edit bounty'
-        return Link('+edit', text, icon='edit')
-
-    def subscription(self):
-        user = getUtility(ILaunchBag).user
-        if (user is not None and
-            get_subscription_for_person(user, self.context) is not None):
-            text = 'Unsubscribe from Bounty'
-            icon = 'remove'
-        elif user is None:
-            text = 'Subscribe/Unsubscribe'
-            icon = 'edit'
-        else:
-            text = 'Subscribe to Bounty'
-            icon = 'add'
-        return Link('+subscribe', text, icon=icon)
-
-    @enabled_with_permission('launchpad.Admin')
-    def administer(self):
-        text = 'Administer'
-        return Link('+admin', text, icon='edit')
-
-
-def get_subscription_for_person(person, bounty):
-    """Return the subscription the person has on the bounty, or None if there
-    is not such subscription.
-    """
-    # XXX: SteveAlexander 2005-09-23:
-    # Refactor to method on IBounty.
-    for subscription in bounty.subscriptions:
-        if subscription.person.id == person.id:
-            return subscription
-    return None
-
-
-class BountyView(LaunchpadView):
-    """View class used for bounty pages."""
-
-    __used_for__ = IBounty
-
-    def initialize(self):
-        self.notices = []
-        # establish if a subscription form was posted
-        newsub = self.request.form.get('subscribe', None)
-        if newsub is not None and self.user and self.request.method == 'POST':
-            if newsub == 'Subscribe':
-                self.context.subscribe(self.user)
-            elif newsub == 'Unsubscribe':
-                self.context.unsubscribe(self.user)
-            self.notices.append(
-                "Your subscription to this bounty has been updated.")
-
-    @property
-    def subscription(self):
-        """establish if this user has a subscription"""
-        if self.user is None:
-            return None
-        return get_subscription_for_person(self.user, self.context)
-
-
-class BountyEditView(EditView):
-
-    def changed(self):
-        self.request.response.redirect(canonical_url(self.context))
-
-
-class BountyLinkView(AddView):
-
-    def __init__(self, context, request):
-        self.request = request
-        self.context = context
-        self._nextURL = '.'
-        AddView.__init__(self, context, request)
-
-    def createAndAdd(self, data):
-        bounty = data['bounty']
-        bountylink = self.context.ensureRelatedBounty(bounty)
-        self._nextURL = canonical_url(self.context)
-        return bounty
-
-    def nextURL(self):
-        return self._nextURL
-
-
-class BountyAddView(AddView):
-
-    def __init__(self, context, request):
-        self.request = request
-        self.context = context
-        self._nextURL = '.'
-        AddView.__init__(self, context, request)
-
-    def createAndAdd(self, data):
-        # add the owner information for the bounty
-        owner = getUtility(ILaunchBag).user
-        if not owner:
-            raise Unauthorized(
-                "Must have an authenticated user in order to create a bounty")
-        # XXX Mark Shuttleworth 2004-11-09:
-        # Need the fancy-person selector to select a reviewer.
-        reviewer = owner
-        bounty = getUtility(IBountySet).new(
-            name=data['name'],
-            title=data['title'],
-            summary=data['summary'],
-            description=data['description'],
-            usdvalue=data['usdvalue'],
-            owner=owner,
-            reviewer=reviewer)
-        # if the context is a product, or a project, or a distribution, then
-        # we need to link to it
-        if IProduct.providedBy(self.context) or \
-           IProject.providedBy(self.context) or \
-           IDistribution.providedBy(self.context):
-            self.context.ensureRelatedBounty(bounty)
-        notify(ObjectCreatedEvent(bounty))
-        self._nextURL = canonical_url(bounty)
-        return bounty
-
-    def nextURL(self):
-        return self._nextURL
-
-
-class BountySetView(LaunchpadView):
-
-    def initialize(self):
-        self.bounties = getUtility(IBountySet)
-
-    def top_bounties(self):
-        return self.bounties.top_bounties
-

=== removed file 'lib/canonical/launchpad/browser/bountysubscription.py'
--- lib/canonical/launchpad/browser/bountysubscription.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/browser/bountysubscription.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-__metaclass__ = type
-
-__all__ = ['BountySubscriptionNavigation']
-
-from canonical.launchpad.webapp import GetitemNavigation
-from canonical.launchpad.interfaces import IBountySubscription
-
-
-class BountySubscriptionNavigation(GetitemNavigation):
-
-    usedfor = IBountySubscription
-

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2009-08-26 07:59:49 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2009-08-28 06:38:41 +0000
@@ -52,7 +52,6 @@
 from lp.registry.interfaces.announcement import IAnnouncementSet
 from lp.soyuz.interfaces.binarypackagename import (
     IBinaryPackageNameSet)
-from canonical.launchpad.interfaces.bounty import IBountySet
 from lp.code.interfaces.branch import IBranchSet
 from lp.code.interfaces.branchlookup import IBranchLookup
 from lp.code.interfaces.branchnamespace import InvalidNamespace
@@ -136,7 +135,7 @@
             if link.enabled or config.devmode],
             key=operator.attrgetter('sort_key'))
         facet = menuapi.selectedfacetname()
-        if facet not in ('unknown', 'bounties'):
+        if facet != 'unknown':
             # XXX sinzui 2008-06-23 bug=242453:
             # Why are we getting unknown? Bounties are borked. We need
             # to end the facet hacks to get a clear state for the menus.
@@ -341,12 +340,6 @@
         summary = 'Launchpad feature specification tracker.'
         return Link(target, text, summary)
 
-    def bounties(self):
-        target = 'bounties'
-        text = 'Bounties'
-        summary = 'The Launchpad Universal Bounty Tracker'
-        return Link(target, text, summary)
-
     def branches(self):
         target = ''
         text = 'Code'
@@ -492,7 +485,6 @@
         '+announcements': IAnnouncementSet,
         'binarypackagenames': IBinaryPackageNameSet,
         'branches': IBranchSet,
-        'bounties': IBountySet,
         'bugs': IMaloneApplication,
         'builders': IBuilderSet,
         '+code': IBazaarApplication,

=== modified file 'lib/canonical/launchpad/browser/message.py'
--- lib/canonical/launchpad/browser/message.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/browser/message.py	2009-08-27 07:05:16 +0000
@@ -5,33 +5,10 @@
 
 __metaclass__ = type
 
-__all__ = ['MessageAddView']
-
 from zope.interface import implements
 
-from canonical.launchpad import _
-from canonical.launchpad.interfaces.message import IIndexedMessage, IMessage
-from canonical.launchpad.webapp import canonical_url
+from canonical.launchpad.interfaces.message import IIndexedMessage
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
-from canonical.launchpad.webapp.launchpadform import action, LaunchpadFormView
-
-
-# XXX: salgado, 2008-10-16: This view is currently unused because it's only
-# used by bounties and those are not exposed anywhere. It is also untested, so
-# it's very likely it doesn't work -- I only touched it because I wanted to
-# get rid of SQLObjectAddView and this was the last place using it.
-class MessageAddView(LaunchpadFormView):
-    """View class for adding an IMessage to an IBug."""
-
-    schema = IMessage
-    label = 'Add message or comment'
-    field_names = ['subject', 'content']
-
-    @action(_('Add'), name='add')
-    def add_action(self, action, data):
-        self.context.newMessage(
-            owner=self.user, subject=data['subject'], content=data['content'])
-        self.next_url = canonical_url(self.context)
 
 
 class BugMessageCanonicalUrlData:

=== modified file 'lib/canonical/launchpad/database/__init__.py'
--- lib/canonical/launchpad/database/__init__.py	2009-07-23 18:10:26 +0000
+++ lib/canonical/launchpad/database/__init__.py	2009-08-27 07:05:16 +0000
@@ -56,16 +56,10 @@
 
 from canonical.launchpad.database.account import *
 from canonical.launchpad.database.personnotification import *
-from canonical.launchpad.database.productbounty import *
 from canonical.launchpad.database.packaging import *
-from canonical.launchpad.database.projectbounty import *
 from canonical.launchpad.database.librarian import *
 from canonical.launchpad.database.launchpadstatistic import *
 from canonical.launchpad.database.binaryandsourcepackagename import *
-from canonical.launchpad.database.distributionbounty import *
-from canonical.launchpad.database.bounty import *
-from canonical.launchpad.database.bountymessage import *
-from canonical.launchpad.database.bountysubscription import *
 from canonical.launchpad.database.message import *
 from canonical.launchpad.database.structuralsubscription import *
 from canonical.launchpad.database.logintoken import *

=== removed file 'lib/canonical/launchpad/database/bounty.py'
--- lib/canonical/launchpad/database/bounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/bounty.py	1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0611,W0212
-
-__metaclass__ = type
-__all__ = ['Bounty', 'BountySet']
-
-
-from email.Utils import make_msgid
-
-from zope.interface import implements
-from zope.app.form.browser.interfaces import IAddFormCustomization
-
-from sqlobject import ForeignKey, StringCol
-from sqlobject import CurrencyCol
-from sqlobject import SQLMultipleJoin, SQLRelatedJoin
-
-from canonical.launchpad.interfaces import (
-    BountyDifficulty, BountyStatus, IBounty, IBountySet, NotFoundError)
-
-from canonical.database.sqlbase import SQLBase
-from canonical.database.constants import DEFAULT
-from canonical.database.datetimecol import UtcDateTimeCol
-from canonical.database.enumcol import EnumCol
-
-from canonical.launchpad.database.message import Message, MessageChunk
-from canonical.launchpad.database.bountymessage import BountyMessage
-from canonical.launchpad.database.bountysubscription import BountySubscription
-from lp.registry.interfaces.person import validate_public_person
-
-
-class Bounty(SQLBase):
-    """A bounty."""
-
-    implements(IBounty)
-
-    # default to listing newest first
-    _defaultOrder = '-id'
-
-    # db field names
-    name = StringCol(unique=True, notNull=True)
-    title = StringCol(notNull=True)
-    summary = StringCol(notNull=True)
-    description = StringCol( notNull=True)
-    usdvalue = CurrencyCol(notNull=True)
-    bountystatus = EnumCol(enum=BountyStatus, notNull=True,
-        default=BountyStatus.OPEN)
-    difficulty = EnumCol(enum=BountyDifficulty, notNull=True,
-        default=BountyDifficulty.NORMAL)
-    reviewer = ForeignKey(
-        dbName='reviewer', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
-    datecreated = UtcDateTimeCol(notNull=True, default=DEFAULT)
-    owner = ForeignKey(
-        dbName='owner', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
-    claimant = ForeignKey(
-        dbName='claimant', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=False, default=None)
-
-    # useful joins
-    subscriptions = SQLMultipleJoin('BountySubscription', joinColumn='bounty',
-        orderBy='id')
-    products = SQLRelatedJoin('Product', joinColumn='bounty',
-        intermediateTable='ProductBounty', otherColumn='product',
-        orderBy='name')
-    projects = SQLRelatedJoin('Project', joinColumn='bounty',
-        intermediateTable='ProjectBounty', otherColumn='project',
-        orderBy='name')
-    distributions = SQLRelatedJoin('Distribution', joinColumn='bounty',
-        intermediateTable='DistributionBounty', otherColumn='distribution',
-        orderBy='name')
-
-    # subscriptions
-    def subscribe(self, person):
-        # first see if a relevant subscription exists, and if so, update it
-        for sub in self.subscriptions:
-            if sub.person.id == person.id:
-                return sub
-        # since no previous subscription existed, create a new one
-        return BountySubscription(
-            bounty=self,
-            person=person)
-
-    def unsubscribe(self, person):
-        # see if a relevant subscription exists, and if so, delete it
-        for sub in self.subscriptions:
-            if sub.person.id == person.id:
-                sub.destroySelf()
-                return
-
-    # message related
-    messages = SQLRelatedJoin('Message', joinColumn='bounty',
-        otherColumn='message',
-        intermediateTable='BountyMessage', orderBy='datecreated')
-
-    def newMessage(self, owner, subject, content):
-        """See IMessageTarget."""
-        msg = Message(owner=owner, rfc822msgid=make_msgid('bounty'),
-            subject=subject)
-        chunk = MessageChunk(message=msg, content=content, sequence=1)
-        bountymsg = BountyMessage(bounty=self, message=msg)
-        return bountymsg
-
-    def linkMessage(self, message):
-        """See IMessageTarget."""
-        for msg in self.messages:
-            if msg == message:
-                return None
-        BountyMessage(bounty=self, message=message)
-        return None
-
-    @property
-    def followup_subject(self):
-        """See IMessageTarget."""
-        if not self.messages:
-            return 'Re: '+ self.title
-        subject = self.messages[-1].title
-        if subject[:4].lower() == 're: ':
-            return subject
-        return 'Re: ' + subject
-
-
-class BountySet:
-    """A set of bounties."""
-
-    implements(IBountySet, IAddFormCustomization)
-
-    def __init__(self):
-        self.title = 'Launchpad Bounties'
-
-    def __getitem__(self, name):
-        bounty = Bounty.selectOneBy(name=name)
-        if bounty is None:
-            raise NotFoundError(name)
-        return bounty
-
-    def __iter__(self):
-        for row in Bounty.select():
-            yield row
-
-    def new(self, name, title, summary, description, usdvalue, owner,
-            reviewer):
-        return Bounty(
-            name=name,
-            title=title,
-            summary=summary,
-            description=description,
-            usdvalue=usdvalue,
-            owner=owner,
-            reviewer=reviewer)
-
-    @property
-    def top_bounties(self):
-        """See IBountySet."""
-        return Bounty.select(orderBy=['-usdvalue'])[:5]
-

=== removed file 'lib/canonical/launchpad/database/bountymessage.py'
--- lib/canonical/launchpad/database/bountymessage.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/bountymessage.py	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0611,W0212
-
-__metaclass__ = type
-
-__all__ = ['BountyMessage', ]
-
-from email.Utils import make_msgid
-
-from zope.interface import implements
-
-from sqlobject import ForeignKey
-
-from canonical.launchpad import _
-from canonical.database.sqlbase import SQLBase
-from canonical.launchpad.interfaces import IBountyMessage
-from canonical.launchpad.database.message import Message, MessageChunk
-
-
-class BountyMessage(SQLBase):
-    """A table linking bounties and messages."""
-
-    implements(IBountyMessage)
-
-    _table = 'BountyMessage'
-
-    bounty = ForeignKey(dbName='bounty', foreignKey='Bounty', notNull=True)
-    message = ForeignKey(dbName='message', foreignKey='Message', notNull=True)
-
-

=== removed file 'lib/canonical/launchpad/database/bountysubscription.py'
--- lib/canonical/launchpad/database/bountysubscription.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/bountysubscription.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0611,W0212
-
-__metaclass__ = type
-__all__ = ['BountySubscription', 'BountySubscriptionSet']
-
-from zope.interface import implements
-
-from sqlobject import ForeignKey
-
-from canonical.launchpad.interfaces import \
-    IBountySubscription, IBountySubscriptionSet
-
-from canonical.database.sqlbase import SQLBase
-from lp.registry.interfaces.person import validate_public_person
-
-
-class BountySubscription(SQLBase):
-    """A subscription by a person to a bounty."""
-
-    implements(IBountySubscription)
-
-    _table = 'BountySubscription'
-
-    bounty = ForeignKey(dbName='bounty', foreignKey='Bounty', notNull=True)
-    person = ForeignKey(
-        dbName='person', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
-
-
-class BountySubscriptionSet:
-    """A set for BountySubscription objects."""
-
-    implements(IBountySubscriptionSet)
-

=== removed file 'lib/canonical/launchpad/database/distributionbounty.py'
--- lib/canonical/launchpad/database/distributionbounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/distributionbounty.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0611,W0212
-
-__metaclass__ = type
-__all__ = ['DistributionBounty',]
-
-from zope.interface import implements
-
-from sqlobject import ForeignKey
-
-from canonical.launchpad.interfaces import IDistributionBounty
-
-from canonical.database.sqlbase import SQLBase
-
-
-class DistributionBounty(SQLBase):
-    """A relationship between a distribution and a bounty."""
-
-    implements(IDistributionBounty)
-
-    _table='DistributionBounty'
-    bounty = ForeignKey(dbName='bounty', foreignKey='Bounty', notNull=True)
-    distribution = ForeignKey(dbName='distribution',
-        foreignKey='Distribution', notNull=True)
-

=== removed file 'lib/canonical/launchpad/database/productbounty.py'
--- lib/canonical/launchpad/database/productbounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/productbounty.py	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0611,W0212
-
-__metaclass__ = type
-__all__ = ['ProductBounty',]
-
-from zope.interface import implements
-
-from sqlobject import ForeignKey
-
-from canonical.launchpad.interfaces import IProductBounty
-
-from canonical.database.sqlbase import SQLBase
-
-
-class ProductBounty(SQLBase):
-    """A relationship between a product and a bounty."""
-
-    implements(IProductBounty)
-
-    _table='ProductBounty'
-    bounty = ForeignKey(dbName='bounty', foreignKey='Bounty', notNull=True)
-    product = ForeignKey(dbName='product', foreignKey='Product', notNull=True)
-

=== removed file 'lib/canonical/launchpad/database/projectbounty.py'
--- lib/canonical/launchpad/database/projectbounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/database/projectbounty.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0611,W0212
-
-__metaclass__ = type
-__all__ = ['ProjectBounty',]
-
-from zope.interface import implements
-
-from sqlobject import ForeignKey
-
-from canonical.launchpad.interfaces import IProjectBounty
-
-from canonical.database.sqlbase import SQLBase
-
-
-class ProjectBounty(SQLBase):
-    """A relationship between a project and a bounty."""
-
-    implements(IProjectBounty)
-
-    _table='ProjectBounty'
-    bounty = ForeignKey(dbName='bounty', foreignKey='Bounty', notNull=True)
-    project = ForeignKey(dbName='project', foreignKey='Project',
-        notNull=True)
-

=== removed file 'lib/canonical/launchpad/doc/bounty.txt'
--- lib/canonical/launchpad/doc/bounty.txt	2007-08-09 14:49:07 +0000
+++ lib/canonical/launchpad/doc/bounty.txt	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-
-This is a basic test that sanity checks and reassigns a bounty.
-
-    >>> from zope.component import getUtility
-    >>> from canonical.launchpad.webapp.testing import verifyObject
-    >>> from canonical.launchpad.interfaces import IBountySet, IPersonSet
-    >>> from canonical.launchpad.ftests import login
-    >>> from canonical.database.sqlbase import flush_database_updates
-
-Be a superuser:
-
-    >>> login("[e-mail]")
-
-Grab any bounty:
-
-    >>> bounty = getUtility(IBountySet)["evo-vcard"]
-    >>> print bounty.owner.name
-    name16
-    >>> sample_person = getUtility(IPersonSet).getByName("name12")
-
-Let's try to reassign:
-
-    >>> bounty.owner = sample_person
-    >>> print bounty.owner.name
-    name12
-

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2009-08-28 13:40:55 +0000
+++ lib/canonical/launchpad/icing/style.css	2009-08-31 00:06:29 +0000
@@ -137,7 +137,6 @@
 .translation-template {background:url(icon-sprites-2) 0 -864px no-repeat;}
 .trash-icon {background:url(icon-sprites-2) 0 -896px no-repeat;}
 .stop {background:url(icon-sprites-2) 0 -928px no-repeat;}
-.bounty {background:url(icon-sprites-2) 0 -960px no-repeat;}
 .list {background:url(icon-sprites-2) 0 -992px no-repeat;}
 .bullet {background:url(icon-sprites-2) 0 -1024px no-repeat;}
 .zoom-in {background:url(icon-sprites-2) 0 -1056px no-repeat;}

=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
--- lib/canonical/launchpad/interfaces/__init__.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/interfaces/__init__.py	2009-08-27 07:05:16 +0000
@@ -27,9 +27,6 @@
 from canonical.launchpad.interfaces.authtoken import *
 from lp.soyuz.interfaces.binarypackagerelease import *
 from lp.soyuz.interfaces.binarypackagename import *
-from canonical.launchpad.interfaces.bounty import *
-from canonical.launchpad.interfaces.bountymessage import *
-from canonical.launchpad.interfaces.bountysubscription import *
 from lp.bugs.interfaces.bugactivity import *
 from lp.bugs.interfaces.bugattachment import *
 from lp.bugs.interfaces.bug import *
@@ -56,7 +53,6 @@
 from lp.bugs.interfaces.cve import *
 from lp.bugs.interfaces.cvereference import *
 from lp.registry.interfaces.distribution import *
-from canonical.launchpad.interfaces.distributionbounty import *
 from lp.registry.interfaces.distributionmirror import *
 from lp.registry.interfaces.distributionsourcepackage import *
 from lp.soyuz.interfaces.distributionsourcepackagecache import *
@@ -103,12 +99,10 @@
 from lp.registry.interfaces.poll import *
 from lp.soyuz.interfaces.processor import *
 from lp.registry.interfaces.product import *
-from canonical.launchpad.interfaces.productbounty import *
 from lp.registry.interfaces.productlicense import *
 from lp.registry.interfaces.productrelease import *
 from lp.registry.interfaces.productseries import *
 from lp.registry.interfaces.project import *
-from canonical.launchpad.interfaces.projectbounty import *
 from lp.soyuz.interfaces.publishedpackage import *
 from lp.soyuz.interfaces.publishing import *
 from lp.soyuz.interfaces.queue import *

=== removed file 'lib/canonical/launchpad/interfaces/bounty.py'
--- lib/canonical/launchpad/interfaces/bounty.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/interfaces/bounty.py	1970-01-01 00:00:00 +0000
@@ -1,225 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-
-"""Bounty interfaces."""
-
-__metaclass__ = type
-
-__all__ = [
-    'BountyDifficulty',
-    'BountyStatus',
-    'IBounty',
-    'IBountySet',
-    ]
-
-
-from zope.interface import Attribute
-
-from zope.schema import Datetime, Int, Choice, Text, TextLine, Float
-from zope.app.form.browser.interfaces import IAddFormCustomization
-from lazr.enum import DBEnumeratedType, DBItem
-
-from canonical.launchpad import _
-from canonical.launchpad.fields import Summary, Title, PublicPersonChoice
-from canonical.launchpad.validators.name import name_validator
-from lp.registry.interfaces.role import IHasOwner
-
-
-class BountyDifficulty(DBEnumeratedType):
-    """Bounty Difficulty
-
-    An indicator of the difficulty of a particular bounty.
-    """
-
-    TRIVIAL = DBItem(10, """
-        Trivial
-
-        This bounty requires only very basic skills to complete the task. No
-        real domain knowledge is required, only simple system
-        administration, writing or configuration skills, and the ability to
-        publish the work.""")
-
-    BASIC = DBItem(20, """
-        Basic
-
-        This bounty requires some basic programming skills, in a high level
-        language like Python or C# or... BASIC. However, the project is
-        being done "standalone" and so no knowledge of existing code is
-        required.""")
-
-    STRAIGHTFORWARD = DBItem(30, """
-        Straightforward
-
-        This bounty is easy to implement but does require some broader
-        understanding of the framework or application within which the work
-        must be done.""")
-
-    NORMAL = DBItem(50, """
-        Normal
-
-        This bounty requires a moderate amount of programming skill, in a
-        high level language like HTML, CSS, JavaScript, Python or C#. It is
-        an extension to an existing application or package so the work will
-        need to follow established project coding standards.""")
-
-    CHALLENGING = DBItem(60, """
-        Challenging
-
-        This bounty requires knowledge of a low-level programming language
-        such as C or C++.""")
-
-    DIFFICULT = DBItem(70, """
-        Difficult
-
-        This project requires knowledge of a low-level programming language
-        such as C or C++ and, in addition, requires extensive knowledge of
-        an existing codebase into which the work must fit.""")
-
-    VERYDIFFICULT = DBItem(90, """
-        Very Difficult
-
-        This project requires exceptional programming skill and knowledge of
-        very low level programming environments, such as assembly
-        language.""")
-
-    EXTREME = DBItem(100, """
-        Extreme
-
-        In order to complete this work, detailed knowledge of an existing
-        project is required, and in addition the work itself must be done in
-        a low-level language like assembler or C on multiple
-        architectures.""")
-
-
-class BountyStatus(DBEnumeratedType):
-    """Bounty Status
-
-    An indicator of the status of a particular bounty. This can be edited by
-    the bounty owner or reviewer.
-    """
-
-    OPEN = DBItem(1, """
-        Open
-
-        This bounty is open. People are still welcome to contact the creator
-        or reviewer of the bounty, and submit their work for consideration
-        for the bounty.""")
-
-    WITHDRAWN = DBItem(9, """
-        Withdrawn
-
-        This bounty has been withdrawn.
-        """)
-
-    CLOSED = DBItem(10, """
-        Closed
-
-        This bounty is closed. No further submissions will be considered.
-        """)
-
-
-class IBounty(IHasOwner):
-    """The core bounty description."""
-
-    id = Int(
-            title=_('Bounty ID'), required=True, readonly=True,
-            )
-    name = TextLine(
-            title=_('Name'), required=True,
-            description=_("""Keep this name very short, unique, and
-            descriptive, because it will be used in URLs. Examples:
-            mozilla-type-ahead-find, postgres-smart-serial."""),
-            constraint=name_validator,
-            )
-    title = Title(
-            title=_('Title'), required=True
-            )
-    summary = Summary(
-            title=_('Summary'), required=True
-            )
-    description = Text(
-            title=_('Description'), required=True,
-            description=_("""Include exact results that will be acceptable to
-            the bounty owner and reviewer, and contact details for the person
-            coordinating the bounty.""")
-            )
-    usdvalue = Float(
-            title=_('Estimated value (US dollars)'),
-            required=True, description=_("""In some cases the
-            bounty may have been offered in a variety of
-            currencies, so this USD value is an estimate based
-            on recent currency rates.""")
-            )
-    bountystatus = Choice(
-        title=_('Status'), vocabulary=BountyStatus,
-        default=BountyStatus.OPEN)
-    difficulty = Choice(
-        title=_('Difficulty'), vocabulary=BountyDifficulty,
-        default=BountyDifficulty.NORMAL)
-    reviewer = PublicPersonChoice(
-        title=_('The bounty reviewer.'), required=False,
-        description=_("The person who is responsible for deciding whether "
-        "the bounty is awarded, and to whom if there are multiple "
-        "claimants."), vocabulary='ValidPersonOrTeam')
-    datecreated = Datetime(
-            title=_('Date Created'), required=True, readonly=True,
-            )
-    owner = PublicPersonChoice(
-        title=_('Owner'),
-        required=True,
-        vocabulary='ValidOwner',
-        description=_("""Owner (registrant) of Bounty."""))
-    # XXX kiko 2005-01-14:
-    # is this really necessary? IDs shouldn't be exposed in interfaces.
-    ownerID = Int(
-            title=_('Owner'), required=True, readonly=True
-            )
-
-    # joins
-    subscriptions = Attribute('The set of subscriptions to this bounty.')
-    projects = Attribute(
-        'The project groups which this bounty is related to.')
-    products = Attribute('The projects to which this bounty is related.')
-    distributions = Attribute(
-        'The distributions to which this bounty is related.')
-
-    # subscription-related methods
-    def subscribe(person):
-        """Subscribe this person to the bounty."""
-
-    def unsubscribe(person):
-        """Remove this person's subscription to this bounty."""
-
-    messages = Attribute(
-        "The messages related to this object, in reverse "
-        "order of creation (so newest first).")
-
-    followup_subject = Attribute("The likely subject of the next message.")
-
-    def newMessage(owner, subject, content):
-        """Create a new message, and link it to this object."""
-
-    def linkMessage(message):
-        """Link the given message to this object."""
-
-
-
-# Interfaces for containers
-class IBountySet(IAddFormCustomization):
-    """A container for bounties."""
-
-    title = Attribute('Title')
-
-    top_bounties = Attribute('The top 5 bounties in the system')
-
-    def __getitem__(key):
-        """Get a bounty."""
-
-    def __iter__():
-        """Iterate through the bounties in this set."""
-
-    def new(name, title, summary, description, usdvalue, owner, reviewer):
-        """Create a new bounty."""
-

=== removed file 'lib/canonical/launchpad/interfaces/bountymessage.py'
--- lib/canonical/launchpad/interfaces/bountymessage.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/interfaces/bountymessage.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-
-"""Bounty message interfaces."""
-
-__metaclass__ = type
-
-__all__ = [
-    'IBountyMessage',
-    ]
-
-from zope.interface import Interface, Attribute
-from canonical.launchpad import _
-
-class IBountyMessage(Interface):
-    """A link between a bounty and a message."""
-
-    bounty = Attribute("The bounty.")
-    message = Attribute("The message.")
-
-

=== removed file 'lib/canonical/launchpad/interfaces/bountysubscription.py'
--- lib/canonical/launchpad/interfaces/bountysubscription.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/interfaces/bountysubscription.py	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-
-"""Bounty subscription interfaces."""
-
-__metaclass__ = type
-
-__all__ = [
-    'IBountySubscription',
-    'IBountySubscriptionSet',
-    ]
-
-from zope.interface import Interface, Attribute
-from zope.schema import Int
-from canonical.launchpad import _
-from canonical.launchpad.fields import PublicPersonChoice
-
-class IBountySubscription(Interface):
-    """The relationship between a person and a bounty."""
-
-    id = Int(title=_('ID'), readonly=True, required=True)
-    person = PublicPersonChoice(
-            title=_('Person ID'), required=True,
-            vocabulary='ValidPersonOrTeam', readonly=True,
-            )
-    bounty = Int(title=_('Bounty ID'), required=True, readonly=True)
-
-
-class IBountySubscriptionSet(Interface):
-    """A set for IBountySubscription objects."""
-
-    title = Attribute('Title')
-
-    def __getitem__(key):
-        """Get a BountySubscription object."""
-
-    def __iter__():
-        """Iterate over all bounty subscriptions."""
-
-    def delete(id):
-        """Delete a bounty subscription."""
-

=== removed file 'lib/canonical/launchpad/interfaces/distributionbounty.py'
--- lib/canonical/launchpad/interfaces/distributionbounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/interfaces/distributionbounty.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-"""Interface for the linker between Distribution and Bounty."""
-
-__metaclass__ = type
-
-__all__ = [
-    'IDistributionBounty',
-    ]
-
-from zope.interface import Interface
-from zope.schema import Choice, Int
-from canonical.launchpad import _
-
-class IDistributionBounty(Interface):
-    """The relationship between a distribution and a bounty."""
-
-    id = Int(title=_('ID'), readonly=True, required=True)
-    distribution = Choice(
-        title=_('Distribution'), required=True, vocabulary='Distribution',
-        readonly=True)
-    bounty = Choice(title=_('Bounty'), required=True, readonly=True,
-        vocabulary='Bounty', description=_("The existing Launchpad "
-        "bounty, which you would like to show as being related to this "
-        "distribution."))
-

=== removed file 'lib/canonical/launchpad/interfaces/productbounty.py'
--- lib/canonical/launchpad/interfaces/productbounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/interfaces/productbounty.py	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-
-"""Interface for the linker between Product and Bounty."""
-
-__metaclass__ = type
-
-__all__ = [
-    'IProductBounty',
-    ]
-
-from zope.interface import Interface
-from zope.schema import Choice, Int
-from canonical.launchpad import _
-
-class IProductBounty(Interface):
-    """The relationship between a product and a bounty."""
-
-    id = Int(title=_('ID'), readonly=True, required=True)
-    product = Choice(
-        title=_('Project'), required=True, vocabulary='Product',
-        readonly=True)
-    bounty = Choice(title=_('Bounty'), required=True, readonly=True,
-        vocabulary='Bounty', description=_("The existing Launchpad "
-        "bounty, which you would like to show as being related to "
-        "this project."))
-

=== removed file 'lib/canonical/launchpad/interfaces/projectbounty.py'
--- lib/canonical/launchpad/interfaces/projectbounty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/interfaces/projectbounty.py	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-
-"""Interface for the linker between Project and Bounty."""
-
-__metaclass__ = type
-
-__all__ = [
-    'IProjectBounty',
-    ]
-
-from zope.interface import Interface
-from zope.schema import Choice, Int
-from canonical.launchpad import _
-
-class IProjectBounty(Interface):
-    """The relationship between a project and a bounty."""
-
-    id = Int(title=_('ID'), readonly=True, required=True)
-    project = Choice(
-        title=_('Project'), required=True, vocabulary='Project',
-        readonly=True)
-    bounty = Choice(title=_('Bounty'), required=True, readonly=True,
-        vocabulary='Bounty', description=_("The existing Launchpad "
-        "bounty, which you would like to show as being related to this "
-        "project."))
-

=== modified file 'lib/canonical/launchpad/locales/launchpad.po.es.old'
--- lib/canonical/launchpad/locales/launchpad.po.es.old	2007-05-27 23:01:01 +0000
+++ lib/canonical/launchpad/locales/launchpad.po.es.old	2009-08-27 07:05:16 +0000
@@ -35,14 +35,6 @@
 msgid "Administer something"
 msgstr ""
 
-#: /home/carlos/Work/dists/launchpad/lib/canonical/launchpad/zcml/bounty.zcml:36
-msgid "Modify Bounty:"
-msgstr ""
-
-#: /home/carlos/Work/dists/launchpad/lib/canonical/launchpad/zcml/bounty.zcml:65
-msgid "Create A New Bounty"
-msgstr ""
-
 #: /home/carlos/Work/dists/launchpad/lib/canonical/launchpad/zcml/bug.zcml:36
 msgid "Change Bug Information"
 msgstr ""
@@ -207,116 +199,6 @@
 msgid "Name"
 msgstr ""
 
-#: l/launchpad/interfaces/bounty.py:19
-msgid "Bounty ID"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:22
-msgid "Bounty name"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:23
-msgid ""
-"A short and unique name for this bounty. \n"
-"                This allows us to refer to the bounty directly in a url,\n"
-"                so it needs to be destinct and descriptive. For example:\n"
-"                mozilla-type-ahead-find and\n"
-"                postgres-smart-serial."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:31
-msgid "Bounty title"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:32
-msgid ""
-"The title of the bounty should be no more than 70\n"
-"            characters long, and is displayed in every list or report of "
-"bounties. It\n"
-"            should be as clear as possible in the space allotted what the\n"
-"            bounty is for."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:38 l/launchpad/interfaces/bug.py:41
-#: l/launchpad/interfaces/distribution.py:19
-#: l/launchpad/interfaces/distroseries.py:21
-#: l/launchpad/interfaces/product.py:37
-msgid "Summary"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:39
-msgid ""
-"The bounty summary is a single paragraph\n"
-"            description of the bounty. This will also be desplayed in most\n"
-"            bounty listings."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:44 l/launchpad/interfaces/bug.py:47
-#: l/launchpad/interfaces/bugattachment.py:23
-#: l/launchpad/interfaces/bugtracker.py:14
-#: l/launchpad/interfaces/country.py:32
-#: l/launchpad/interfaces/distribution.py:22
-#: l/launchpad/interfaces/distroseries.py:25
-#: l/launchpad/interfaces/product.py:40
-#: l/launchpad/interfaces/productrelease.py:20
-#: l/launchpad/interfaces/project.py:35
-#: l/launchpad/interfaces/sourcepackage.py:33
-#: l/launchpad/interfaces/sourcepackage.py:34
-#: l/launchpad/interfaces/sourcepackage.py:52
-#: l/launchpad/interfaces/sourcepackage.py:53
-msgid "Description"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:45
-msgid ""
-"The bounty description should be a detailed\n"
-"            description of the bounty, aimed ad specifying the exact "
-"results\n"
-"            that will be acceptable to the bounty owner and reviewer."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:50
-msgid "Estimated USD Value"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:51
-msgid ""
-"The value of this bounty, in\n"
-"            USD. Note that in some cases the bounty may have been offered "
-"in\n"
-"            a variety of currencies, so this USD value is an estimate based\n"
-"            on recent currency rates."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:57
-msgid "Difficulty"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:58
-msgid ""
-"The difficulty of this bounty,\n"
-"            rated from 1 to 100 where 100 is most difficult. An example of\n"
-"            an extremely difficult bounty would be something that requires\n"
-"            extensive and rare knowledge, such as a kernel memory "
-"management\n"
-"            subsystem."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:65
-msgid "Duration"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:66
-msgid ""
-"The expected time required to\n"
-"            complete this bounty work, given the necessary skills."
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:70
-msgid "Reviewer"
-msgstr ""
-
-#: l/launchpad/interfaces/bounty.py:72 l/launchpad/interfaces/bug.py:22
 #: l/launchpad/interfaces/bugassignment.py:28
 #: l/launchpad/interfaces/bugassignment.py:81
 #: l/launchpad/interfaces/bugextref.py:33
@@ -327,7 +209,6 @@
 msgid "Date Created"
 msgstr ""
 
-#: l/launchpad/interfaces/bounty.py:75 l/launchpad/interfaces/bug.py:54
 #: l/launchpad/interfaces/bug.py:117
 #: l/launchpad/interfaces/bugassignment.py:31
 #: l/launchpad/interfaces/bugassignment.py:35

=== modified file 'lib/canonical/launchpad/locales/launchpad.pot'
--- lib/canonical/launchpad/locales/launchpad.pot	2007-05-27 23:01:01 +0000
+++ lib/canonical/launchpad/locales/launchpad.pot	2009-08-27 07:05:16 +0000
@@ -173,7 +173,6 @@
 msgstr ""
 
 #: d/interfaces/archuser.py:22
-#: d/interfaces/bounty.py:82
 #: d/interfaces/bug.py:60
 #: d/interfaces/bug.py:219
 #: d/interfaces/bugextref.py:48
@@ -205,7 +204,6 @@
 
 #: d/interfaces/binarypackage.py:22
 #: d/interfaces/binarypackagename.py:21
-#: d/interfaces/bountysubscription.py:21
 #: d/interfaces/bugattachment.py:24
 #: d/interfaces/bugextref.py:29
 #: d/interfaces/bugsubscription.py:21
@@ -242,12 +240,6 @@
 msgid "Valid Binary package name"
 msgstr ""
 
-#: d/interfaces/bounty.py:29
-#: d/interfaces/bountysubscription.py:26
-msgid "Bounty ID"
-msgstr ""
-
-#: d/interfaces/bounty.py:32
 #: d/interfaces/bugattachment.py:31
 #: d/interfaces/bugtracker.py:23
 #: d/interfaces/cal.py:102
@@ -268,14 +260,6 @@
 msgid "Name"
 msgstr ""
 
-#: d/interfaces/bounty.py:33
-msgid ""
-"Keep this name very short, unique, and\n"
-"            descriptive, because it will be used in URLs. Examples:\n"
-"            mozilla-type-ahead-find, postgres-smart-serial."
-msgstr ""
-
-#: d/interfaces/bounty.py:39
 #: d/interfaces/bug.py:49
 #: d/interfaces/bugextref.py:40
 #: d/interfaces/bugtracker.py:24
@@ -291,14 +275,6 @@
 msgid "Title"
 msgstr ""
 
-#: d/interfaces/bounty.py:40
-msgid ""
-"Describe the task as clearly as\n"
-"            possible in up to 70 characters. This title is\n"
-"            displayed in every bounty list or report."
-msgstr ""
-
-#: d/interfaces/bounty.py:45
 #: d/interfaces/bug.py:52
 #: d/interfaces/bugtracker.py:25
 #: d/interfaces/distribution.py:36
@@ -310,14 +286,6 @@
 msgid "Summary"
 msgstr ""
 
-#: d/interfaces/bounty.py:46
-msgid ""
-"A single-paragraph description of the\n"
-"            bounty. This will also be displayed in most\n"
-"            bounty listings."
-msgstr ""
-
-#: d/interfaces/bounty.py:51
 #: d/interfaces/bug.py:57
 #: d/interfaces/bug.py:220
 #: d/interfaces/bugattachment.py:34
@@ -334,54 +302,6 @@
 msgid "Description"
 msgstr ""
 
-#: d/interfaces/bounty.py:52
-msgid ""
-"A detailed description. Include exact\n"
-"            results that will be acceptable to the bounty owner and\n"
-"            reviewer."
-msgstr ""
-
-#: d/interfaces/bounty.py:57
-msgid "Estimated value (US dollars)"
-msgstr ""
-
-#: d/interfaces/bounty.py:58
-msgid ""
-"In some cases the\n"
-"            bounty may have been offered in a variety of\n"
-"            currencies, so this USD value is an estimate based\n"
-"            on recent currency rates."
-msgstr ""
-
-#: d/interfaces/bounty.py:64
-msgid "Difficulty"
-msgstr ""
-
-#: d/interfaces/bounty.py:65
-msgid ""
-"From 1 (easiest) to 100\n"
-"            (most difficult). An example of\n"
-"            an extremely difficult bounty would be something that requires\n"
-"            extensive and rare knowledge, such as a kernel memory management\n"
-"            subsystem."
-msgstr ""
-
-#: d/interfaces/bounty.py:72
-msgid "Duration"
-msgstr ""
-
-#: d/interfaces/bounty.py:73
-msgid ""
-"The expected time required to\n"
-"            complete this bounty work, given the necessary skills."
-msgstr ""
-
-#: d/interfaces/bounty.py:77
-#: d/interfaces/person.py:566
-msgid "Reviewer"
-msgstr ""
-
-#: d/interfaces/bounty.py:79
 #: d/interfaces/bug.py:41
 #: d/interfaces/bugextref.py:45
 #: d/interfaces/bugwatch.py:34
@@ -403,26 +323,14 @@
 msgid "Date Created"
 msgstr ""
 
-#: d/interfaces/bountysubscription.py:23
 #: d/interfaces/bugsubscription.py:23
 msgid "Person ID"
 msgstr ""
 
-#: d/interfaces/bountysubscription.py:28
 #: d/interfaces/bugsubscription.py:28
 msgid "Subscription"
 msgstr ""
 
-#: d/interfaces/bountysubscription.py:29
-msgid ""
-"Your subscription to a bounty can be one of\n"
-"            \"watch\", \"cc\" or \"none\". If you \"watch\" a bounty then it will\n"
-"            show up on your reports, but you won't normally receive bounty\n"
-"            mail. If you \"cc\" yourself on a bounty you will receive a copy of\n"
-"            all bounty update notifications by email.\n"
-"            "
-msgstr ""
-
 #: d/interfaces/bug.py:199
 #: d/interfaces/bugtask.py:39
 msgid "Bug #"
@@ -1072,10 +980,6 @@
 msgid "The Lucille Config."
 msgstr ""
 
-#: d/interfaces/distribution.py:80
-msgid "The bounties that are related to this distro."
-msgstr ""
-
 #: d/interfaces/distroseries.py:27
 msgid "The name of this distribution release."
 msgstr ""
@@ -2052,10 +1956,6 @@
 "        when."
 msgstr ""
 
-#: d/interfaces/product.py:174
-msgid "The bounties that are related to this product."
-msgstr ""
-
 #: d/interfaces/product.py:200
 msgid "The URL of the root directory for the product used when the series doesn't supply one."
 msgstr ""
@@ -2281,10 +2181,6 @@
 msgid "Whether or not this project has been reviewed."
 msgstr ""
 
-#: d/interfaces/project.py:134
-msgid "The bounties that are related to this project."
-msgstr ""
-
 #: d/interfaces/project.py:197
 msgid "Bug Tracker"
 msgstr ""
@@ -2858,14 +2754,6 @@
 msgid "Create a new Binary Package Name"
 msgstr ""
 
-#: d/zcml/bounty.zcml:102
-msgid "Create A New Bounty"
-msgstr ""
-
-#: d/zcml/bounty.zcml:62
-msgid "Modify Bounty:"
-msgstr ""
-
 #: d/zcml/bug.zcml:150
 msgid "File a Bug on a Product"
 msgstr ""

=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2009-08-21 21:10:49 +0000
+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt	2009-08-27 07:05:16 +0000
@@ -96,8 +96,6 @@
 >>> check_not_found("/+groups/foos",
 ...                 host='translations.launchpad.dev')
 
->>> check("/bounties")
->>> check("/bounties/foomatic-widgets")
 
 >>> check("/codeofconduct")
 >>> check("/codeofconduct/1.0")
@@ -146,7 +144,6 @@
 >>> check("/distros/+add", auth=True)
 
 >>> check("/ubuntu")
->>> check("/ubuntu/+bounties")
 >>> check("/ubuntu/+bugs")
 >>> check("/ubuntu/+specs")
 >>> check("/ubuntu/+cve")
@@ -158,8 +155,6 @@
 >>> check("/ubuntu/+settings", host='translations.launchpad.dev',
 ...       auth=True)
 >>> check("/ubuntu/hoary/+addmilestone", auth=True)
->>> check("/ubuntu/+linkbounty", auth=True)
->>> check("/ubuntu/+addbounty", auth=True)
 >>> check("/ubuntu/+addspec", auth=True)
 >>> check("/ubuntu/+imports", host='translations.launchpad.dev')
 >>> check("/debian/+milestone/3.1")
@@ -379,7 +374,6 @@
 >>> check("/~name18/+reassign", auth=True)
 >>> check("/~name18/+review", auth=True)
 >>> check("/~name18/+specs")
->>> check("/~name18/+bounties")
 >>> check_redirect("/~name18/+translations", status=301)
 >>> check("/~name18/+translations", host='translations.launchpad.dev')
 >>> check("/~name18/+imports", host='translations.launchpad.dev')

=== removed directory 'lib/canonical/launchpad/pagetests/bounty'
=== removed file 'lib/canonical/launchpad/pagetests/bounty/xx-bounty-creation.txt'
--- lib/canonical/launchpad/pagetests/bounty/xx-bounty-creation.txt	2007-04-14 10:26:11 +0000
+++ lib/canonical/launchpad/pagetests/bounty/xx-bounty-creation.txt	1970-01-01 00:00:00 +0000
@@ -1,254 +0,0 @@
-Creating Bounties
-=================
-
-We should be able to create a bounty directly, without any connected product
-or project or distribution. Note this is a bad idea.
-
-  >>> print http(r"""
-  ... GET /bounties/+new HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-First we test if the name field validator is working
-
-  >>> print http(r"""
-  ... POST /firefox/+addbounty HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... Content-Length: 1948
-  ... Content-Type: multipart/form-data; boundary=---------------------------33938214415580350852058287477
-  ... 
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.name"
-  ... 
-  ... New-FF-bounty
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.title"
-  ... 
-  ... fs dsdfkjhsdlkhjslkjdf sdlkjf slkjd hfsdhfsdh
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.summary"
-  ... 
-  ... hfs lskjdhf zlkjdshf zslkdjlkj hzdl hflz hlhvlkjc hvlkjhdsflkhdsf lskd lkjsz hlkjds flzkshflkjsz lkjsz hlkjz flkjszh lkfzhlkz lkjzs flkjsz hflksz hlkzs hflkj hdszlkjhs dlkfhsdlkjh sdlkjh slkjs hfdlkjs hfdlkjs hdlkshlkj hdlksjhdslkjh fslkjhslkdhflkds hlkjds hfslkjd hflksjhslkjh lkjd sd s.s sd fhsk s sdfs.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.usdvalue"
-  ... 
-  ... 230.00
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty"
-  ... 
-  ... Difficult
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty-empty-marker"
-  ... 
-  ... 1
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.description"
-  ... 
-  ... kjsd hkjs hfksd hfksdj hfkjds hfskdj hskdjhf skdhf skdhf sdkj skj hfdkjsdh fksjd hfkjshd fkjshfdkshd fksksjd hfksjd hfkshfdksjdhf ksjhsd fkjhskjhsdkfh skdhfksdhfksdjhf kks hdfkjshd ksj hks ksjdhfks hks ks kjdshfksjdh fkjsh ksj hfkshf skjhd ksjh fks hdfkshd fksjhkjshd fks h.
-  ... 
-  ... sdf lksjflskjdflks dlkfsdlkf slusdou s shd fkjshdfkjshdf kskj hfkskjs hksjhfd kshflzkjdhfkhvllkjfd vlnb belk i  d f,mbd,mbelkh lv lkdjh lk jkmd,ks  jhlkjh lkcj hfdkjh skjh kjds fkjdshf skdjhf lkuvcyiuyvlkejre ,nb ,m siu yvdyieyerkjekjfdkksd skdjh dskh kdsjhfkjsd.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
-  ... 
-  ... Add
-  ... -----------------------------33938214415580350852058287477--
-  ... """)
-  HTTP/1.1 200 Ok 
-  ...
-  ...Invalid name 'New-FF-bounty'...
-  ...
-  
-
-Now let's create a bounty for the Firefox product.
-
-  >>> print http(r"""
-  ... POST /firefox/+addbounty HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... Content-Length: 1948
-  ... Content-Type: multipart/form-data; boundary=---------------------------33938214415580350852058287477
-  ... 
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.name"
-  ... 
-  ... new-ff-bounty
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.title"
-  ... 
-  ... fs dsdfkjhsdlkhjslkjdf sdlkjf slkjd hfsdhfsdh
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.summary"
-  ... 
-  ... hfs lskjdhf zlkjdshf zslkdjlkj hzdl hflz hlhvlkjc hvlkjhdsflkhdsf lskd lkjsz hlkjds flzkshflkjsz lkjsz hlkjz flkjszh lkfzhlkz lkjzs flkjsz hflksz hlkzs hflkj hdszlkjhs dlkfhsdlkjh sdlkjh slkjs hfdlkjs hfdlkjs hdlkshlkj hdlksjhdslkjh fslkjhslkdhflkds hlkjds hfslkjd hflksjhslkjh lkjd sd s.s sd fhsk s sdfs.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.usdvalue"
-  ... 
-  ... 230.00
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty"
-  ... 
-  ... Difficult
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty-empty-marker"
-  ... 
-  ... 1
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.description"
-  ... 
-  ... kjsd hkjs hfksd hfksdj hfkjds hfskdj hskdjhf skdhf skdhf sdkj skj hfdkjsdh fksjd hfkjshd fkjshfdkshd fksksjd hfksjd hfkshfdksjdhf ksjhsd fkjhskjhsdkfh skdhfksdhfksdjhf kks hdfkjshd ksj hks ksjdhfks hks ks kjdshfksjdh fkjsh ksj hfkshf skjhd ksjh fks hdfkshd fksjhkjshd fks h.
-  ... 
-  ... sdf lksjflskjdflks dlkfsdlkf slusdou s shd fkjshdfkjshdf kskj hfkskjs hksjhfd kshflzkjdhfkhvllkjfd vlnb belk i  d f,mbd,mbelkh lv lkdjh lk jkmd,ks  jhlkjh lkcj hfdkjh skjh kjds fkjdshf skdjhf lkuvcyiuyvlkejre ,nb ,m siu yvdyieyerkjekjfdkksd skdjh dskh kdsjhfkjsd.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
-  ... 
-  ... Add
-  ... -----------------------------33938214415580350852058287477--
-  ... """)
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://.../bounties/new-ff-bounty
-  ...
-
-And let's view it, making sure it is linked to Firefox.
-
-  >>> print http(r"""
-  ... GET /bounties/new-ff-bounty HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...Mozilla Firefox...
-
-
-OK, we should also be able to see the +addbounty page on a Project.
-
-  >>> print http(r"""
-  ... GET /mozilla/+addbounty HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-Let's test it!
-
-  >>> print http(r"""
-  ... POST /mozilla/+addbounty HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... Content-Length: 1948
-  ... Content-Type: multipart/form-data; boundary=---------------------------33938214415580350852058287477
-  ... 
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.name"
-  ... 
-  ... new-mz-bounty
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.title"
-  ... 
-  ... fs dsdfkjhsdlkhjslkjdf sdlkjf slkjd hfsdhfsdh
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.summary"
-  ... 
-  ... hfs lskjdhf zlkjdshf zslkdjlkj hzdl hflz hlhvlkjc hvlkjhdsflkhdsf lskd lkjsz hlkjds flzkshflkjsz lkjsz hlkjz flkjszh lkfzhlkz lkjzs flkjsz hflksz hlkzs hflkj hdszlkjhs dlkfhsdlkjh sdlkjh slkjs hfdlkjs hfdlkjs hdlkshlkj hdlksjhdslkjh fslkjhslkdhflkds hlkjds hfslkjd hflksjhslkjh lkjd sd s.s sd fhsk s sdfs.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.usdvalue"
-  ... 
-  ... 230.00
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty"
-  ... 
-  ... Difficult
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty-empty-marker"
-  ... 
-  ... 1
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.description"
-  ... 
-  ... kjsd hkjs hfksd hfksdj hfkjds hfskdj hskdjhf skdhf skdhf sdkj skj hfdkjsdh fksjd hfkjshd fkjshfdkshd fksksjd hfksjd hfkshfdksjdhf ksjhsd fkjhskjhsdkfh skdhfksdhfksdjhf kks hdfkjshd ksj hks ksjdhfks hks ks kjdshfksjdh fkjsh ksj hfkshf skjhd ksjh fks hdfkshd fksjhkjshd fks h.
-  ... 
-  ... sdf lksjflskjdflks dlkfsdlkf slusdou s shd fkjshdfkjshdf kskj hfkskjs hksjhfd kshflzkjdhfkhvllkjfd vlnb belk i  d f,mbd,mbelkh lv lkdjh lk jkmd,ks  jhlkjh lkcj hfdkjh skjh kjds fkjdshf skdjhf lkuvcyiuyvlkejre ,nb ,m siu yvdyieyerkjekjfdkksd skdjh dskh kdsjhfkjsd.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
-  ... 
-  ... Add
-  ... -----------------------------33938214415580350852058287477--
-  ... """)
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://.../bounties/new-mz-bounty
-  ...
-
-And let's view it, making sure it is linked to Firefox.
-
-  >>> print http(r"""
-  ... GET /bounties/new-mz-bounty HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...Mozilla Project...
-
-
-And lastly, on a Distribution.
-
-  >>> print http(r"""
-  ... GET /ubuntu/+addbounty HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-
-  >>> print http(r"""
-  ... POST /ubuntu/+addbounty HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... Content-Length: 1948
-  ... Content-Type: multipart/form-data; boundary=---------------------------33938214415580350852058287477
-  ... 
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.name"
-  ... 
-  ... new-ub-bounty
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.title"
-  ... 
-  ... fs dsdfkjhsdlkhjslkjdf sdlkjf slkjd hfsdhfsdh
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.summary"
-  ... 
-  ... hfs lskjdhf zlkjdshf zslkdjlkj hzdl hflz hlhvlkjc hvlkjhdsflkhdsf lskd lkjsz hlkjds flzkshflkjsz lkjsz hlkjz flkjszh lkfzhlkz lkjzs flkjsz hflksz hlkzs hflkj hdszlkjhs dlkfhsdlkjh sdlkjh slkjs hfdlkjs hfdlkjs hdlkshlkj hdlksjhdslkjh fslkjhslkdhflkds hlkjds hfslkjd hflksjhslkjh lkjd sd s.s sd fhsk s sdfs.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.usdvalue"
-  ... 
-  ... 230.00
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty"
-  ... 
-  ... Difficult
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.difficulty-empty-marker"
-  ... 
-  ... 1
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="field.description"
-  ... 
-  ... kjsd hkjs hfksd hfksdj hfkjds hfskdj hskdjhf skdhf skdhf sdkj skj hfdkjsdh fksjd hfkjshd fkjshfdkshd fksksjd hfksjd hfkshfdksjdhf ksjhsd fkjhskjhsdkfh skdhfksdhfksdjhf kks hdfkjshd ksj hks ksjdhfks hks ks kjdshfksjdh fkjsh ksj hfkshf skjhd ksjh fks hdfkshd fksjhkjshd fks h.
-  ... 
-  ... sdf lksjflskjdflks dlkfsdlkf slusdou s shd fkjshdfkjshdf kskj hfkskjs hksjhfd kshflzkjdhfkhvllkjfd vlnb belk i  d f,mbd,mbelkh lv lkdjh lk jkmd,ks  jhlkjh lkcj hfdkjh skjh kjds fkjdshf skdjhf lkuvcyiuyvlkejre ,nb ,m siu yvdyieyerkjekjfdkksd skdjh dskh kdsjhfkjsd.
-  ... -----------------------------33938214415580350852058287477
-  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
-  ... 
-  ... Add
-  ... -----------------------------33938214415580350852058287477--
-  ... """)
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://.../bounties/new-ub-bounty
-  ...
-
-And let's view it, making sure it is linked to Firefox.
-
-  >>> print http(r"""
-  ... GET /bounties/new-ub-bounty HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...ubuntu...
-
-

=== removed file 'lib/canonical/launchpad/pagetests/bounty/xx-bounty-edit.txt'
--- lib/canonical/launchpad/pagetests/bounty/xx-bounty-edit.txt	2007-04-14 10:26:11 +0000
+++ lib/canonical/launchpad/pagetests/bounty/xx-bounty-edit.txt	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-
-One of the sampledata bounties is called mozilla-svg. Let's take a look at
-it now.
-
-  >>> print http(r"""
-  ... GET /bounties/mozilla-svg HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...Support SVG in Mozilla...
-
-
-Next, let's POST the +edit form, with some updated values. Specifically, we'll
-change the difficulty to basic.
-
-  >>> print http(r"""
-  ... POST /bounties/mozilla-svg/+edit HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... Content-Length: 2175
-  ... Content-Type: multipart/form-data; boundary=---------------------------355648249875698224683328425
-  ... 
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.title"
-  ... 
-  ... Support SVG in Mozilla
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.bountystatus"
-  ... 
-  ... Open
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.bountystatus-empty-marker"
-  ... 
-  ... 1
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.summary"
-  ... 
-  ... SVG is emerging as a well-supported and well-defined standard for classy vector images. Mozilla should support SVG images natively, without plugins as currently required. In addition, it would be great to be able to address SVG images using the DOM, since they are made up of XML just like XHTML.
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.difficulty"
-  ... 
-  ... Basic
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.difficulty-empty-marker"
-  ... 
-  ... 1
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="field.description"
-  ... 
-  ...  Since you have come this far, you probably already know that SVG stands for Scalable Vector Graphics, and that it is an XML language for sophisticated 2-dimensional graphics. SVG is to graphics what XHTML is to text, MathML is to mathematical equations and CML is to the description of chemical molecules.
-  ... 
-  ... SVG is similar in scope to Macromedia's proprietary Flash technology: among other things it offers anti-aliased rendering, pattern and gradient fills, sophisticated filter-effects, clipping to arbitrary paths, text and animations. What distinguishes SVG from Flash, is that it is a W3 recommendation (i.e. a standard for all intents and purposes) and that it is XML-based as opposed to a closed binary format. It is explicitly designed to work with other W3C standards such as CSS, DOM and SMIL. 
-  ... 
-  ... -----------------------------355648249875698224683328425
-  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
-  ... 
-  ... Change
-  ... -----------------------------355648249875698224683328425--
-  ... """)
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://.../bounties/mozilla-svg
-  ...
-

=== removed file 'lib/canonical/launchpad/pagetests/bounty/xx-bounty-list-all.txt'
--- lib/canonical/launchpad/pagetests/bounty/xx-bounty-list-all.txt	2007-04-14 10:26:11 +0000
+++ lib/canonical/launchpad/pagetests/bounty/xx-bounty-list-all.txt	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-The /bounties/ page should show all registered bounties.
-
-  >>> print http(r"""
-  ... GET /bounties HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...Bounties registered in Launchpad...
-  ...
-  ...Comprehensive support for VCARD in Evolution...

=== removed file 'lib/canonical/launchpad/pagetests/bounty/xx-bounty-relations.txt'
--- lib/canonical/launchpad/pagetests/bounty/xx-bounty-relations.txt	2007-04-14 10:26:11 +0000
+++ lib/canonical/launchpad/pagetests/bounty/xx-bounty-relations.txt	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-
-Relations
-=========
-
-Now, let's look at how another bounty is related to a product, a
-distribution, and a project. We'll look at foomatic-widgets. We can see that
-it mentions Ubuntu, Mozilla Firefox, and the Mozilla Project.
-
-  >>> print http(r"""
-  ... GET /bounties/foomatic-widgets/ HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...ubuntu...
-  ...Mozilla Firefox...
-  ...the Mozilla Project...
-
-
-So now let's also make sure that we have a relateds portlet for a bounty.
-
-  >>> print http(r"""
-  ... GET /bounties/foomatic-widgets/+portlet-relateds HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-
-And one for details.
-
-  >>> print http(r"""
-  ... GET /bounties/foomatic-widgets/+portlet-details HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-
-And a portlet for subscribers.
-
-  >>> print http(r"""
-  ... GET /bounties/foomatic-widgets/+portlet-subscribers HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-
-Just for fun we will check the reverse, we will check the bounties portlets
-on Ubuntu, Mozilla Firefox and the Mozilla Project.
-
-  >>> print http(r"""
-  ... GET /ubuntu/+portlet-bounties HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...foomatic-widgets...
-
-
-  >>> print http(r"""
-  ... GET /firefox/+portlet-bounties HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...foomatic-widgets...
-
-
-  >>> print http(r"""
-  ... GET /mozilla/+portlet-bounties HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...foomatic-widgets...
-
-

=== removed file 'lib/canonical/launchpad/pagetests/bounty/xx-bounty-subscriptions.txt'
--- lib/canonical/launchpad/pagetests/bounty/xx-bounty-subscriptions.txt	2007-04-14 10:26:11 +0000
+++ lib/canonical/launchpad/pagetests/bounty/xx-bounty-subscriptions.txt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-
-Now, let's subscribe to the Bounty. First, we want to display the
-"subscribe" page.
-
-  >>> print http(r"""
-  ... GET /bounties/mozilla-svg/+subscribe HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... """)
-  HTTP/1.1 200 Ok
-  ...Subscribe to bounty...
-
-Now, let's POST our subscription. The POST should be directed to the
-bounty page itself, and we should see a message.
-
-  >>> print http(r"""
-  ... POST /bounties/mozilla-svg/ HTTP/1.1
-  ... Authorization: Basic Y2FybG9zQGNhbm9uaWNhbC5jb206dGVzdA==
-  ... Content-Length: 19
-  ... Content-Type: application/x-www-form-urlencoded
-  ... 
-  ... subscribe=Subscribe""")
-  HTTP/1.1 200 Ok
-  ...Your subscription to this bounty has been updated...
-
-

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-08-28 15:54:41 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-08-31 00:06:29 +0000
@@ -158,18 +158,6 @@
 
 binarypackagenames_index = 'Binary package name set'
 
-bounties_index = 'Bounties registered in Launchpad'
-
-bounty_add = 'Register a bounty'
-
-bounty_edit = ContextTitle(smartquote('Edit bounty "%s"'))
-
-bounty_link = ContextTitle('Link a bounty to %s')
-
-bounty_index = ContextTitle(smartquote('Bounty "%s" in Launchpad'))
-
-bounty_subscription = ContextTitle(smartquote('Subscription to bounty "%s"'))
-
 branch_bug_links = ContextDisplayName(smartquote('Bug links for %s'))
 
 branch_index = ContextDisplayName(smartquote(
@@ -789,8 +777,6 @@
 person_answer_contact_for = ContextDisplayName(
     'Projects for which %s is an answer contact')
 
-person_bounties = ContextDisplayName('Bounties for %s')
-
 person_changepassword = 'Change your password'
 
 person_claim = 'Claim account'
@@ -1048,8 +1034,6 @@
 
 registry_index = 'Project and group registration in Launchpad'
 
-related_bounties = ContextDisplayName('Bounties for %s')
-
 remotebug_index = ContextTitle('%s')
 
 root_featuredprojects = 'Manage featured projects in Launchpad'

=== removed file 'lib/canonical/launchpad/templates/bounties-index.pt'
--- lib/canonical/launchpad/templates/bounties-index.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounties-index.pt	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-    
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-about" />
-  <div tal:replace="structure context/@@+portlet-details" />
-</metal:leftportlets>
-
-<div metal:fill-slot="main">
-
-      <h1>Bounties registered in Launchpad</h1>
-
-    <p>
-    In Launchpad, a bounty is an offer of payment
-    for development work.
-    <tal:block condition="request/lp:person">
-      You can register bounties
-      or sign up for bounties offered by other people.
-    </tal:block>
-    <tal:block condition="not: request/lp:person">
-      <a href="+login">Log in</a>
-      and you&#8217;ll be able to register bounties,
-      or sign up for bounties offered by other people.
-    </tal:block>
-    </p>
-
-  <table class="listing sortable" width="100%" id="bountylist">
-    <thead>
-      <tr>
-        <th>Date</th>
-        <th>Title</th>
-        <th>USD Value<sup>*</sup></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr tal:repeat="bounty context">
-        <td tal:content="bounty/datecreated/fmt:date">
-          date
-        </td>
-        <td><a tal:content="bounty/title/fmt:shorten/57"
-               tal:attributes="href bounty/fmt:url">title</a></td>
-        <td tal:content="bounty/usdvalue">usdvalue</td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p><sup>*</sup> A bounty may include contributions in several currencies.
-    This is an estimate of the bounty value in US dollars, based on recent
-    exchange rates.
-  </p>
-
-</div>
-</body>
-</html>
-<!-- 1-0 done -->

=== removed file 'lib/canonical/launchpad/templates/bounties-portlet-about.pt'
--- lib/canonical/launchpad/templates/bounties-portlet-about.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounties-portlet-about.pt	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<div
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-about">
-  <h2>What&#8217;s this all about?</h2>
-  <div class="portletBody portletContent">
-    <img src="/@@/info" />
-    You can track bounties through The Launchpad. You can associate a bounty
-    with an upstream project, or with a distribution. If you
-    would like to sponsor a bounty yourself, please contact <a
-    href="mailto:[e-mail]">Jane Weideman</a>.
-  </div>
-</div>
-

=== removed file 'lib/canonical/launchpad/templates/bounties-portlet-details.pt'
--- lib/canonical/launchpad/templates/bounties-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounties-portlet-details.pt	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<div
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-details">
-
-  <h2>Bounty rules</h2>
-
-  <div class="portletBody portletContent">
-
-  <img src="/@@/info" />
-  You can stake a claim to any unclaimed bounty, but must then begin to
-  deliver code on a regular schedule, or forfeit the claim to someone else.
-  The reviewer will decide when the submission is complete, and can also
-  rule that a claimant is making no progress, which will make the bounty
-  available again. Payments will be made by Paypal, wire transfer can also
-  be made for bounties in excess of $500.
-
-  </div>
-</div>

=== removed file 'lib/canonical/launchpad/templates/bounty-add.pt'
--- lib/canonical/launchpad/templates/bounty-add.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounty-add.pt	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-
-<div metal:fill-slot="main">
-
-      <h1>Register a bounty</h1>
-
-  <div metal:use-macro="context/@@launchpad_addform/addform">
-
-    <p metal:fill-slot="extra_info">
-      You will be listed forever as the creator of this bounty,
-      so ensure you get the details correct.
-      Most importantly, include contact details
-      for the person issuing the bounty.
-      Thanks!
-    </p>
-
-  </div>
-
-</div>
-    
-</body>
-</html>
-<!-- 1-0 done -->

=== removed file 'lib/canonical/launchpad/templates/bounty-edit.pt'
--- lib/canonical/launchpad/templates/bounty-edit.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounty-edit.pt	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-<tal:tag condition="view/update" />
-  <body>
-
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-</metal:leftportlets>
-
-  <div metal:fill-slot="main">
-
-      <h1>Change bounty details</h1>
-
-    <div metal:use-macro="context/@@launchpad_editform/editform">
-
-          <h1 tal:condition="view/label"
-              tal:content="view/label"
-              metal:fill-slot="heading"
-              >Form Label will come from ZCML label="xxx"</h1>
-
-    </div>
-
-  </div>
-    
-</body>
-</html>
-<!-- 1-0 done -->

=== removed file 'lib/canonical/launchpad/templates/bounty-index.pt'
--- lib/canonical/launchpad/templates/bounty-index.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounty-index.pt	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-  <div tal:replace="structure context/@@+portlet-subscribers" />
-</metal:leftportlets>
-
-<metal:rightportlets fill-slot="portlets_two">
-  <div tal:replace="structure context/@@+portlet-relateds" />
-</metal:rightportlets>
-
-<div metal:fill-slot="main">
-
-      <h1 tal:content="context/title">Bounty name</h1>
-
-  <p tal:repeat="notice view/notices"
-     tal:content="notice"
-     class="error message"
-     >Error message</p>
-
-  <p class="documentDescription" tal:content="context/summary">
-    $Bounty.summary goes here. This should be quite short,
-    just a single paragraph of text really, giving a summary of
-    this Bounty.
-  </p>
-
-  <p tal:content="context/description">
-    $Bounty.description goes here. It could be quite long, a few
-    paragraphs at least, and should specify in detail the requirements
-    of the bounty, so that both claimant and reviewer will know when the
-    bounty has been completed.
-  </p>
-
-  <tal:message repeat="message context/messages">
-    <div class="boardComment"
-         tal:condition="python:context.description != message.text_contents">
-
-      <div class="boardCommentDetails">
-        <strong tal:content="message/title">$Message.title</strong>
-
-        Posted
-        <span
-          tal:attributes="title message/datecreated/fmt:datetime"
-          tal:content="message/datecreated/fmt:displaydate"
-          >2 minutes ago</span>
-        by <a href="#" tal:attributes="href message/owner/fmt:url" 
-                       tal:content="message/owner/displayname|string:(nobody)">
-          $Person.displayname</a>
-      </div>
-
-      <div class="boardCommentBody">
-        <tal:comment
-          content="structure message/text_contents/fmt:text-to-html"
-        >
-          Comment text.
-        </tal:comment>
-      </div>
-
-    </div>
-  </tal:message>
-
-  <tal:logged-in condition="request/lp:person">
-    <fieldset class="collapsible collapsed">
-      <legend>Add comment to this bounty</legend>
-        <form action="+addmessage" method="post">
-          <b>Subject:</b>
-          <input name="field.subject" type="text" size="50" 
-                 tal:attributes="value context/followup_subject" /><br />
-          <b>Comment:</b> <textarea name="field.content" rows="10"></textarea>
-          <br />
-        <input type="submit" name="UPDATE_SUBMIT" value="Post Comment" />
-        </form>
-    </fieldset>
-  </tal:logged-in>
-  <tal:not-logged-in condition="not: request/lp:person">
-    <div align="center">
-      To post a comment you must <a href="+login">log in</a>.
-    </div>
-  </tal:not-logged-in>
-
-</div>
-
-</body>
-</html>
-<!-- 1-0 done -->

=== removed file 'lib/canonical/launchpad/templates/bounty-portlet-details.pt'
--- lib/canonical/launchpad/templates/bounty-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounty-portlet-details.pt	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<div
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-details">
-
-  <h2>Bounty details</h2>
-
-  <div class="portletBody portletContent">
-
-    <b>Registered by:</b>
-    <a tal:replace="structure context/owner/fmt:link">Foo Bar</a><br />
-  </div>
-
-</div>

=== removed file 'lib/canonical/launchpad/templates/bounty-portlet-subscribers.pt'
--- lib/canonical/launchpad/templates/bounty-portlet-subscribers.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounty-portlet-subscribers.pt	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<div
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-subscribers">
-  <h2>Bounty subscribers</h2>
-
-  <div class="portletBody portletContent">
-
-    <ul class="person">
-      <li tal:repeat="sub context/subscriptions">
-        <a href="#"
-           tal:content="sub/person/displayname"
-           tal:attributes="href sub/person/fmt:url">Dafydd Harries</a>
-      </li>
-      <li class="info" tal:condition="not: context/subscriptions">
-        <i>No subscribers</i>
-      </li>
-    </ul>
-  </div>
-</div>

=== removed file 'lib/canonical/launchpad/templates/bounty-subscription.pt'
--- lib/canonical/launchpad/templates/bounty-subscription.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bounty-subscription.pt	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-details" />
-  <div tal:replace="structure context/@@+portlet-subscribers" />
-</metal:leftportlets>
-
-<div metal:fill-slot="main">
-
-      <div tal:content="context/title">Bounty name</div>
-      <h1 tal:condition="not: view/subscription">Subscribe to bounty</h1>
-      <h1 tal:condition="view/subscription">Unsubscribe from bounty</h1>
-
-      <p>
-        Bounty subscribers will be e-mailed copies of any comments made on
-        this bounty. If you subscribe to a bounty it will show up on your
-        personal pages, too.
-      </p>
-
-  <form action="." method="POST">
-
-    <div class="actions">
-      <input type="submit"
-             name="cancel"
-             value="Cancel" />
-      <input tal:condition="not: view/subscription"
-             type="submit"
-             name="subscribe"
-             value="Subscribe" />
-      <input tal:condition="view/subscription"
-             type="submit"
-             name="subscribe"
-             value="Unsubscribe" />
-    </div>
-  </form>
-
-</div>
-
-</body>
-</html>
-<!-- 1-0 done -->

=== modified file 'lib/canonical/launchpad/vocabularies/configure.zcml'
--- lib/canonical/launchpad/vocabularies/configure.zcml	2009-07-19 04:41:14 +0000
+++ lib/canonical/launchpad/vocabularies/configure.zcml	2009-08-27 07:05:16 +0000
@@ -5,12 +5,6 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <utility
-    name="Bounty"
-    component="canonical.launchpad.vocabularies.BountyVocabulary"
-    provides="zope.schema.interfaces.IVocabularyFactory"
-    />
-
-  <utility
     name="Branch"
     component="canonical.launchpad.vocabularies.BranchVocabulary"
     provides="zope.schema.interfaces.IVocabularyFactory"

=== modified file 'lib/canonical/launchpad/vocabularies/dbobjects.py'
--- lib/canonical/launchpad/vocabularies/dbobjects.py	2009-07-31 02:10:10 +0000
+++ lib/canonical/launchpad/vocabularies/dbobjects.py	2009-08-27 07:05:16 +0000
@@ -10,7 +10,6 @@
 __metaclass__ = type
 
 __all__ = [
-    'BountyVocabulary',
     'HostedBranchRestrictedOnOwnerVocabulary',
     'BranchRestrictedOnProductVocabulary',
     'BranchVocabulary',
@@ -56,7 +55,6 @@
 from lp.code.model.branch import Branch
 from lp.bugs.model.bug import Bug
 from lp.bugs.model.bugtracker import BugTracker
-from canonical.launchpad.database.bounty import Bounty
 from canonical.launchpad.database import Archive, BugWatch
 from lp.soyuz.model.component import Component
 from lp.soyuz.model.distroarchseries import DistroArchSeries
@@ -225,12 +223,6 @@
     _orderBy = 'id'
 
 
-class BountyVocabulary(SQLObjectVocabularyBase):
-
-    _table = Bounty
-    # XXX kiko 2006-02-20: no _orderBy?
-
-
 class BugTrackerVocabulary(SQLObjectVocabularyBase):
 
     _table = BugTracker

=== modified file 'lib/canonical/launchpad/webapp/__init__.py'
--- lib/canonical/launchpad/webapp/__init__.py	2009-06-25 05:39:50 +0000
+++ lib/canonical/launchpad/webapp/__init__.py	2009-08-27 07:05:16 +0000
@@ -121,12 +121,6 @@
         summary = 'Blueprints and specifications'
         return Link('', text, summary)
 
-    def bounties(self):
-        target = '+bounties'
-        text = 'Bounties'
-        summary = 'View related bounty offers'
-        return Link(target, text, summary)
-
     def branches(self):
         # this is disabled by default, because relatively few objects have
         # branch views

=== removed file 'lib/canonical/launchpad/zcml/bounty.zcml'
--- lib/canonical/launchpad/zcml/bounty.zcml	2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/bounty.zcml	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
-     GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:i18n="http://namespaces.zope.org/i18n"
-    i18n_domain="launchpad">
-
-<facet facet="bounties">
-
-  <!-- Bounty -->
-  <class class="canonical.launchpad.database.Bounty">
-    <allow interface="canonical.launchpad.interfaces.IBounty" />
-    <require
-      permission="launchpad.AnyPerson"
-      set_schema="canonical.launchpad.interfaces.IBounty" />
-  </class>
-
-  <browser:defaultView
-    for="canonical.launchpad.interfaces.IBounty"
-    name="+index" />
-
-  <browser:url
-      for="canonical.launchpad.interfaces.IBounty"
-      path_expression="name"
-      parent_utility="canonical.launchpad.interfaces.IBountySet"
-      />
-
-    <!-- The bounty system is kept maintained but not available for users.
-    This is achieved by putting it on the PageTestLayer. -->
-    <browser:pages
-        for="canonical.launchpad.interfaces.IBounty"
-        class="canonical.launchpad.browser.BountyView"
-        layer="canonical.launchpad.layers.PageTestLayer"
-        permission="zope.Public">
-        <browser:page
-            name="+index"
-            template="../templates/bounty-index.pt"
-            />
-        <browser:page
-            name="+portlet-details"
-            template="../templates/bounty-portlet-details.pt"
-            />
-        <browser:page
-            name="+portlet-relateds"
-            template="../templates/bounty-portlet-relateds.pt"
-            />
-        <browser:page
-            name="+portlet-subscribers"
-            template="../templates/bounty-portlet-subscribers.pt"
-            />
-    </browser:pages>
-
-    <browser:pages
-        for="canonical.launchpad.interfaces.IBounty"
-        class="canonical.launchpad.browser.BountyView"
-        permission="launchpad.AnyPerson">
-        <browser:page
-            name="+subscribe"
-            template="../templates/bounty-subscription.pt"
-            />
-    </browser:pages>
-
-    <browser:editform
-        name="+edit"
-        schema="canonical.launchpad.interfaces.IBounty"
-        class="canonical.launchpad.browser.BountyEditView"
-        fields="title bountystatus summary difficulty description"
-        permission="launchpad.Edit"
-        template="../templates/bounty-edit.pt"
-        />
-
-    <browser:editform
-        name="+admin"
-        schema="canonical.launchpad.interfaces.IBounty"
-        label="Administer bounty"
-        fields="name owner title bountystatus summary usdvalue difficulty description"
-        permission="launchpad.Admin"
-        template="../templates/bounty-edit.pt"
-        />
-
-    <browser:page
-      name="+addmessage"
-      for="canonical.launchpad.interfaces.IBounty"
-      class="canonical.launchpad.browser.MessageAddView"
-      permission="launchpad.AnyPerson"
-      template="../templates/message-add.pt"
-      />
-
-
-    <!-- BountySet -->
-    <class class="canonical.launchpad.database.BountySet">
-        <allow interface="canonical.launchpad.interfaces.IBountySet" />
-    </class>
-
-    <securedutility
-        class="canonical.launchpad.database.BountySet"
-        provides="canonical.launchpad.interfaces.IBountySet" >
-        <allow interface="canonical.launchpad.interfaces.IBountySet" />
-    </securedutility>
-
-    <browser:url
-        for="canonical.launchpad.interfaces.IBountySet"
-        path_expression="string:bounties"
-        parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
-        />
-
-    <browser:navigation
-        module="canonical.launchpad.browser"
-        classes="BountySetNavigation"
-        />
-
-    <browser:defaultView
-        for="canonical.launchpad.interfaces.IBountySet"
-        name="+index" />
-
-    <!-- The bounty system is kept maintained but not available for users.
-    This is achieved by putting it on the PageTestLayer. -->
-    <browser:addform
-        for="canonical.launchpad.interfaces.IBountySet"
-        layer="canonical.launchpad.layers.PageTestLayer"
-        name="+new"
-        schema="canonical.launchpad.interfaces.IBounty"
-        fields="name title summary usdvalue difficulty description"
-        class="canonical.launchpad.browser.BountyAddView"
-        permission="launchpad.AnyPerson"
-        template="../templates/bounty-add.pt"
-        />
-
-    <!-- The bounty system is kept maintained but is not accessible to users.
-    This is achieved by putting it on the PageTestLayer. -->
-    <browser:pages
-      for="canonical.launchpad.interfaces.IBountySet"
-      layer="canonical.launchpad.layers.PageTestLayer"
-      permission="zope.Public">
-      <browser:page
-        template="../templates/bounties-index.pt"
-        name="+index"
-        />
-      <browser:page
-        template="../templates/bounties-portlet-about.pt"
-        name="+portlet-about" />
-      <browser:page
-        template="../templates/bounties-portlet-details.pt"
-        name="+portlet-details" />
-    </browser:pages>
-
-    <browser:menus
-        module="canonical.launchpad.browser.bounty"
-        classes="BountiesAppMenu BountyContextMenu"
-        />
-
-</facet>
-</configure>

=== removed file 'lib/canonical/launchpad/zcml/bountysubscription.zcml'
--- lib/canonical/launchpad/zcml/bountysubscription.zcml	2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/bountysubscription.zcml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
-     GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:i18n="http://namespaces.zope.org/i18n"
-    i18n_domain="launchpad">
-
-    <!-- BountySubscription -->
-    <class class="canonical.launchpad.database.BountySubscription">
-        <allow interface="canonical.launchpad.interfaces.IBountySubscription" />
-        <require
-            permission="zope.Public"
-            set_schema="canonical.launchpad.interfaces.IBountySubscription"
-        />
-    </class>
-
-    <!-- BountySubscriptionSet -->
-    <class class="canonical.launchpad.database.BountySubscriptionSet">
-        <allow
-          interface="canonical.launchpad.interfaces.IBountySubscriptionSet" />
-    </class>
-
-    <securedutility
-        class="canonical.launchpad.database.BountySubscriptionSet"
-        provides="canonical.launchpad.interfaces.IBountySubscriptionSet">
-        <allow interface="canonical.launchpad.interfaces.IBountySubscriptionSet"
-        />
-    </securedutility>
-
-    <browser:navigation
-        module="canonical.launchpad.browser"
-        classes="BountySubscriptionNavigation"
-        />
-
-</configure>

=== modified file 'lib/canonical/launchpad/zcml/configure.zcml'
--- lib/canonical/launchpad/zcml/configure.zcml	2009-07-23 17:51:28 +0000
+++ lib/canonical/launchpad/zcml/configure.zcml	2009-08-27 07:05:16 +0000
@@ -12,8 +12,6 @@
     <include file="account.zcml" />
     <include file="batchnavigator.zcml" />
     <include file="binaryandsourcepackagename.zcml" />
-    <include file="bountysubscription.zcml" />
-    <include file="bounty.zcml" />
     <include file="crowd.zcml" />
     <include file="datetime.zcml" />
     <include file="decoratedresultset.zcml" />

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-27 11:34:14 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-28 06:38:41 +0000
@@ -312,10 +312,6 @@
         <!-- Projects portlets -->
 
         <browser:page
-            name="+portlet-bounties"
-            facet="bounties"
-            template="../templates/object-portlet-bounties.pt"/>
-        <browser:page
             name="+details"
             facet="overview"
             template="../templates/project-details.pt"/>
@@ -329,14 +325,6 @@
             template="../templates/object-portlet-milestones.pt"/>
     </browser:pages>
     <browser:page
-        facet="bounties"
-        for="lp.registry.interfaces.project.IProject"
-        class="lp.registry.browser.project.ProjectView"
-        layer="canonical.launchpad.layers.PageTestLayer"
-        name="+bounties"
-        permission="zope.Public"
-        template="../templates/related-bounties.pt"/>
-    <browser:page
         for="lp.registry.interfaces.project.IProject"
         class="lp.registry.browser.project.ProjectRdfView"
         facet="overview"
@@ -385,31 +373,6 @@
         class="lp.registry.browser.project.ProjectAddProductView"
         permission="launchpad.AnyPerson"
         template="../templates/product-new.pt"/>
-    <browser:addform
-        name="+linkbounty"
-        for="lp.registry.interfaces.project.IProject"
-        facet="bounties"
-        schema="canonical.launchpad.interfaces.IProjectBounty"
-        class="canonical.launchpad.browser.bounty.BountyLinkView"
-        label="Link an existing bounty"
-        fields="project bounty"
-        keyword_arguments="project bounty"
-        permission="launchpad.AnyPerson"
-        template="../templates/bounty-link.pt">
-        <browser:widget
-            field="project"
-            class="canonical.widgets.ContextWidget"/>
-    </browser:addform>
-    <browser:addform
-        name="+addbounty"
-        for="lp.registry.interfaces.project.IProject"
-        facet="bounties"
-        schema="canonical.launchpad.interfaces.IBounty"
-        label="Register a bounty"
-        fields="name title summary usdvalue difficulty description"
-        class="canonical.launchpad.browser.BountyAddView"
-        permission="launchpad.AnyPerson"
-        template="../../../canonical/launchpad/templates/bounty-add.pt"/>
     <browser:defaultView
         for="lp.registry.interfaces.project.IProjectSet"
         name="+index"/>
@@ -458,7 +421,6 @@
         classes="
             ProjectActionMenu
             ProjectAnswersMenu
-            ProjectBountiesMenu
             ProjectBugsMenu
             ProjectEditNavigationMenu
             ProjectFacets
@@ -942,14 +904,6 @@
             for="lp.registry.interfaces.person.IPerson"
             name="+projects"
             new_name="+related-software"/>
-        <browser:page
-            class="lp.registry.browser.person.PersonView"
-            facet="bounties"
-            for="lp.registry.interfaces.person.IPerson"
-            layer="canonical.launchpad.layers.PageTestLayer"
-            name="+bounties"
-            permission="zope.Public"
-            template="../templates/person-bounties.pt"/>
         <browser:pages
             for="lp.registry.interfaces.person.IPerson"
             permission="zope.Public"
@@ -1435,10 +1389,6 @@
             facet="overview"
             template="../templates/object-milestones.pt"/>
         <browser:page
-            name="+portlet-bounties"
-            facet="bounties"
-            template="../templates/object-portlet-bounties.pt"/>
-        <browser:page
             name="+portlet-packages"
             facet="overview"
             template="../templates/product-portlet-packages.pt"/>
@@ -1473,13 +1423,6 @@
             template="../templates/product-edit-people.pt"/>
     </browser:pages>
     <browser:page
-        facet="bounties"
-        for="lp.registry.interfaces.product.IProduct"
-        layer="canonical.launchpad.layers.PageTestLayer"
-        name="+bounties"
-        permission="zope.Public"
-        template="../templates/related-bounties.pt"/>
-    <browser:page
         name="+edit"
         for="lp.registry.interfaces.product.IProduct"
         facet="overview"
@@ -1507,31 +1450,6 @@
         class="lp.registry.browser.product.ProductReviewLicenseView"
         permission="launchpad.ProjectReview"
         template="../templates/product-review-license.pt"/>
-    <browser:addform
-        name="+linkbounty"
-        for="lp.registry.interfaces.product.IProduct"
-        schema="canonical.launchpad.interfaces.IProductBounty"
-        class="canonical.launchpad.browser.bounty.BountyLinkView"
-        facet="bounties"
-        label="Link an existing bounty"
-        fields="product bounty"
-        keyword_arguments="product bounty"
-        permission="launchpad.AnyPerson"
-        template="../templates/bounty-link.pt">
-        <browser:widget
-            field="product"
-            class="canonical.widgets.ContextWidget"/>
-    </browser:addform>
-    <browser:addform
-        name="+addbounty"
-        for="lp.registry.interfaces.product.IProduct"
-        schema="canonical.launchpad.interfaces.IBounty"
-        label="Register a bounty"
-        fields="name title summary usdvalue difficulty description"
-        class="canonical.launchpad.browser.BountyAddView"
-        facet="bounties"
-        permission="launchpad.AnyPerson"
-        template="../../../canonical/launchpad/templates/bounty-add.pt"/>
     <browser:page
         name="+addseries"
         for="lp.registry.interfaces.product.IProduct"
@@ -1591,7 +1509,6 @@
     <browser:menus
         classes="
             ProductActionNavigationMenu
-            ProductBountiesMenu
             ProductBugsMenu
             ProductEditNavigationMenu
             ProductFacets
@@ -1870,14 +1787,6 @@
     <browser:page
         for="lp.registry.interfaces.distribution.IDistribution"
         class="lp.registry.browser.distribution.DistributionView"
-        facet="bounties"
-        layer="canonical.launchpad.layers.PageTestLayer"
-        name="+bounties"
-        permission="zope.Public"
-        template="../templates/related-bounties.pt"/>
-    <browser:page
-        for="lp.registry.interfaces.distribution.IDistribution"
-        class="lp.registry.browser.distribution.DistributionView"
         permission="zope.Public"
         name="+series-and-milestones"
         facet="overview"
@@ -1905,9 +1814,6 @@
             facet="overview"
             template="../templates/object-milestones.pt"/>
         <browser:page
-            name="+portlet-bounties"
-            template="../templates/object-portlet-bounties.pt"/>
-        <browser:page
             name="+portlet-aboutcve"
             template="../templates/portlet-aboutcve.pt"/>
     </browser:pages>
@@ -1959,30 +1865,6 @@
         facet="overview"
         permission="launchpad.Edit"
         template="../../app/templates/generic-edit.pt"/>
-    <browser:addform
-        name="+linkbounty"
-        for="lp.registry.interfaces.distribution.IDistribution"
-        schema="canonical.launchpad.interfaces.IDistributionBounty"
-        class="canonical.launchpad.browser.bounty.BountyLinkView"
-        facet="bounties"
-        fields="distribution bounty"
-        keyword_arguments="distribution bounty"
-        permission="launchpad.AnyPerson"
-        template="../templates/bounty-link.pt">
-        <browser:widget
-            field="distribution"
-            class="canonical.widgets.ContextWidget"/>
-    </browser:addform>
-    <browser:addform
-        name="+addbounty"
-        for="lp.registry.interfaces.distribution.IDistribution"
-        schema="canonical.launchpad.interfaces.IBounty"
-        label="Register a bounty"
-        fields="name title summary usdvalue difficulty description"
-        class="canonical.launchpad.browser.BountyAddView"
-        facet="bounties"
-        permission="launchpad.AnyPerson"
-        template="../../../canonical/launchpad/templates/bounty-add.pt"/>
     <browser:defaultView
         for="lp.registry.interfaces.distribution.IDistributionSet"
         name="+index"/>
@@ -2018,7 +1900,6 @@
         template="../../app/templates/generic-edit.pt"/>
     <browser:menus
         classes="
-            DistributionBountiesMenu
             DistributionBugsMenu
             DistributionFacets
             DistributionMirrorsNavigationMenu

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-08-27 10:48:44 +0000
+++ lib/lp/registry/browser/distribution.py	2009-08-28 06:38:41 +0000
@@ -452,21 +452,6 @@
         return Link('+subscribe', text)
 
 
-class DistributionBountiesMenu(ApplicationMenu):
-
-    usedfor = IDistribution
-    facet = 'bounties'
-    links = ['new', 'link']
-
-    def new(self):
-        text = 'Register new bounty'
-        return Link('+addbounty', text, icon='add')
-
-    def link(self):
-        text = 'Link existing bounty'
-        return Link('+linkbounty', text, icon='edit')
-
-
 class DistributionSpecificationsMenu(ApplicationMenu):
 
     usedfor = IDistribution

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-08-24 20:28:33 +0000
+++ lib/lp/registry/browser/person.py	2009-08-27 07:05:16 +0000
@@ -690,13 +690,6 @@
             self.context.displayname)
         return Link('', text, summary)
 
-    def bounties(self):
-        text = 'Bounties'
-        browsername = self.context.displayname
-        summary = (
-            'Bounty offers that %s is involved with' % browsername)
-        return Link('+bounties', text, summary)
-
     def branches(self):
         text = 'Code'
         summary = ('Bazaar Branches and revisions registered and authored '
@@ -2707,12 +2700,6 @@
         assert self.context.isTeam()
         return bool(self.openpolls) or bool(self.notyetopenedpolls)
 
-    def no_bounties(self):
-        return not (self.context.ownedBounties or
-            self.context.reviewerBounties or
-            self.context.subscribedBounties or
-            self.context.claimedBounties)
-
     def userIsOwner(self):
         """Return True if the user is the owner of this Team."""
         if self.user is None:

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-08-28 00:58:44 +0000
+++ lib/lp/registry/browser/product.py	2009-08-28 06:38:41 +0000
@@ -10,11 +10,9 @@
     'ProductAddView',
     'ProductAddViewBase',
     'ProductAdminView',
-    'ProductBountiesMenu',
     'ProductBrandingView',
     'ProductBreadcrumb',
     'ProductBugsMenu',
-    'ProductChangeTranslatorsView',
     'ProductDownloadFileMixin',
     'ProductDownloadFilesView',
     'ProductEditNavigationMenu',
@@ -274,12 +272,6 @@
         summary = 'Bugs reported about %s' % self.context.displayname
         return Link('', text, summary)
 
-    def bounties(self):
-        target = '+bounties'
-        text = 'Bounties'
-        summary = 'Bounties related to %s' % self.context.displayname
-        return Link(target, text, summary)
-
     def branches(self):
         text = 'Code'
         summary = 'Branches for %s' % self.context.displayname
@@ -516,21 +508,6 @@
         return Link('+addspec', text, summary, icon='add')
 
 
-class ProductBountiesMenu(ApplicationMenu):
-
-    usedfor = IProduct
-    facet = 'bounties'
-    links = ['new', 'link']
-
-    def new(self):
-        text = 'Register bounty'
-        return Link('+addbounty', text, icon='add')
-
-    def link(self):
-        text = 'Link existing bounty'
-        return Link('+linkbounty', text, icon='edit')
-
-
 def _sort_distros(a, b):
     """Put Ubuntu first, otherwise in alpha order."""
     if a['name'] == 'ubuntu':

=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2009-08-26 17:20:31 +0000
+++ lib/lp/registry/browser/project.py	2009-08-28 06:38:41 +0000
@@ -11,7 +11,6 @@
     'ProjectAddQuestionView',
     'ProjectAddView',
     'ProjectAnswersMenu',
-    'ProjectBountiesMenu',
     'ProjectBrandingView',
     'ProjectBreadcrumb',
     'ProjectBugsMenu',
@@ -285,21 +284,6 @@
     links = ('branding', 'reassign', 'driver', 'administer')
 
 
-class ProjectBountiesMenu(ApplicationMenu):
-
-    usedfor = IProject
-    facet = 'bounties'
-    links = ['new', 'link']
-
-    def new(self):
-        text = 'Register a bounty'
-        return Link('+addbounty', text, icon='add')
-
-    def link(self):
-        text = 'Link existing bounty'
-        return Link('+linkbounty', text, icon='edit')
-
-
 class ProjectSpecificationsMenu(ApplicationMenu):
 
     usedfor = IProject

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2009-08-25 06:25:40 +0000
+++ lib/lp/registry/configure.zcml	2009-08-28 06:16:06 +0000
@@ -321,9 +321,6 @@
         factory="lp.registry.browser.project.ProjectSetBreadcrumb"
         permission="zope.Public"/>
 
-    <!-- The bounty system is kept maintained but not available for users.
-                This is achieved by putting it on the PageTestLayer. -->
-
     <facet
         facet="answers"/>
 
@@ -824,10 +821,6 @@
                 set_schema="lp.registry.interfaces.person.IHasStanding"/>
         </class>
 
-        <!-- The bounty system is kept maintained but not available for users.
-        This is achieved by putting it on the PageTestLayer. -->
-
-
         <!-- Adding SSH keys is the only possibly harmful thing that can be done
         without the user's password, so we use a special permission here to make
         sure only the user (and not launchpad admins) will be able to edit her own
@@ -1205,10 +1198,6 @@
                                                 ProductBugsMenu undeclared until layout bug is fixed -->
 
 
-    <!-- The bounty system is kept maintained but not available for users.
-        This is achieved by putting it on the PageTestLayer. -->
-
-
     <!-- ProductSet-->
 
     <class
@@ -1228,7 +1217,6 @@
                 featuredTranslatables
                 count_all
                 count_translatables
-                count_bounties
                 count_buggy
                 count_featureful
                 count_reviewed
@@ -1452,10 +1440,6 @@
         factory="lp.registry.browser.distribution.DistributionSetBreadcrumb"
         permission="zope.Public"/>
 
-    <!-- The bounty system is kept maintained but not available for users.
-        This is achieved by putting it on the PageTestLayer. -->
-
-
     <!-- DistributionSet -->
 
     <class

=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2009-08-27 19:43:59 +0000
+++ lib/lp/registry/interfaces/distribution.py	2009-08-28 06:38:41 +0000
@@ -209,7 +209,6 @@
         exported_as="series")
     architectures = List(
         title=_("DistroArchSeries inside this Distribution"))
-    bounties = Attribute(_("The bounties that are related to this distro."))
     bugCounter = Attribute("The distro bug counter")
     uploaders = Attribute(_(
         "ArchivePermission records for uploaders with rights to upload to "
@@ -345,11 +344,6 @@
             and the value is a `IDistributionSourcePackageRelease`.
         """
 
-    def ensureRelatedBounty(bounty):
-        """Ensure that the bounty is linked to this distribution. Return
-        None.
-        """
-
     def getDistroSeriesAndPocket(distroseriesname):
         """Return a (distroseries,pocket) tuple which is the given textual
         distroseriesname in this distribution."""

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2009-08-20 08:13:15 +0000
+++ lib/lp/registry/interfaces/person.py	2009-08-27 07:05:16 +0000
@@ -592,12 +592,6 @@
     # which contains valid people but not teams, and we don't really need one
     # apart from here.
     registrant = Attribute('The user who created this profile.')
-    # bounty relations
-    ownedBounties = Attribute('Bounties issued by this person.')
-    reviewerBounties = Attribute('Bounties reviewed by this person.')
-    claimedBounties = Attribute('Bounties claimed by this person.')
-    subscribedBounties = Attribute(
-        'Bounties to which this person subscribes.')
 
     oauth_access_tokens = Attribute(_("Non-expired access tokens"))
 

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2009-08-25 10:51:33 +0000
+++ lib/lp/registry/interfaces/product.py	2009-08-28 06:16:06 +0000
@@ -577,8 +577,6 @@
             readonly=True,
             value_type=Reference(schema=IProductRelease)))
 
-    bounties = Attribute(_("The bounties that are related to this product."))
-
     translatable_packages = Attribute(
         "A list of the source packages for this product that can be "
         "translated sorted by distroseries.name and sourcepackage.name.")
@@ -671,10 +669,6 @@
     def packagedInDistros():
         """Returns the distributions this product has been packaged in."""
 
-    def ensureRelatedBounty(bounty):
-        """Ensure that the bounty is linked to this product. Return None.
-        """
-
     def getCustomLanguageCode(language_code):
         """Look up `ICustomLanguageCode` for `language_code`, if any.
 
@@ -886,10 +880,6 @@
         """Return a count of the number of products that have
         upstream-oriented translations configured in Rosetta."""
 
-    def count_bounties():
-        """Return a number of products that have bounties registered in the
-        Launchpad for them."""
-
     def count_buggy():
         """Return the number of products that have bugs associated with them
         in Launchpad."""

=== modified file 'lib/lp/registry/interfaces/project.py'
--- lib/lp/registry/interfaces/project.py	2009-08-24 03:59:31 +0000
+++ lib/lp/registry/interfaces/project.py	2009-08-28 06:16:06 +0000
@@ -236,9 +236,6 @@
             description=_("Whether or not this project group has been "
                           "reviewed.")))
 
-    bounties = Attribute(
-        _("The bounties that are related to this project group."))
-
     bugtracker = exported(
         Choice(title=_('Bug Tracker'), required=False,
                vocabulary='BugTracker',
@@ -267,12 +264,6 @@
     def getProduct(name):
         """Get a product with name `name`."""
 
-    def ensureRelatedBounty(bounty):
-        """Ensure that the bounty is linked to this project group.
-
-        Return None.
-        """
-
     def translatables():
         """Return an iterator over products that have resources translatables.
 

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2009-08-27 19:43:59 +0000
+++ lib/lp/registry/model/distribution.py	2009-08-28 06:38:41 +0000
@@ -38,7 +38,6 @@
 from lp.bugs.model.bugtask import BugTask
 from lp.soyuz.model.build import Build
 from lp.translations.model.customlanguagecode import CustomLanguageCode
-from canonical.launchpad.database.distributionbounty import DistributionBounty
 from lp.registry.model.distributionmirror import DistributionMirror
 from lp.registry.model.distributionsourcepackage import (
     DistributionSourcePackage)
@@ -172,9 +171,6 @@
         schema=TranslationPermission, default=TranslationPermission.OPEN)
     lucilleconfig = StringCol(
         dbName='lucilleconfig', notNull=False, default=None)
-    bounties = SQLRelatedJoin(
-        'Bounty', joinColumn='distribution', otherColumn='bounty',
-        intermediateTable='DistributionBounty')
     official_answers = BoolCol(dbName='official_answers', notNull=True,
         default=False)
     official_blueprints = BoolCol(dbName='official_blueprints', notNull=True,
@@ -731,13 +727,6 @@
             search_text=search_text, owner=owner, sort=sort,
             distribution=self).getResults()
 
-    def ensureRelatedBounty(self, bounty):
-        """See `IDistribution`."""
-        for curr_bounty in self.bounties:
-            if bounty.id == curr_bounty.id:
-                return None
-        DistributionBounty(distribution=self, bounty=bounty)
-
     def getDistroSeriesAndPocket(self, distroseries_name):
         """See `IDistribution`."""
         from lp.archivepublisher.publishing import suffixpocket

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2009-08-19 14:25:32 +0000
+++ lib/lp/registry/model/person.py	2009-08-31 00:27:24 +0000
@@ -383,18 +383,6 @@
     hide_email_addresses = BoolCol(notNull=True, default=False)
     verbose_bugnotifications = BoolCol(notNull=True, default=True)
 
-    ownedBounties = SQLMultipleJoin('Bounty', joinColumn='owner',
-        orderBy='id')
-    reviewerBounties = SQLMultipleJoin('Bounty', joinColumn='reviewer',
-        orderBy='id')
-    # XXX: matsubara 2006-03-06 bug=33935:
-    # Is this really needed? There's no attribute 'claimant' in the Bounty
-    # database class or interface, but the column exists in the database.
-    claimedBounties = SQLMultipleJoin('Bounty', joinColumn='claimant',
-        orderBy='id')
-    subscribedBounties = SQLRelatedJoin('Bounty', joinColumn='person',
-        otherColumn='bounty', intermediateTable='BountySubscription',
-        orderBy='id')
     signedcocs = SQLMultipleJoin('SignedCodeOfConduct', joinColumn='owner')
     ircnicknames = SQLMultipleJoin('IrcID', joinColumn='person')
     jabberids = SQLMultipleJoin('JabberID', joinColumn='person')
@@ -1736,7 +1724,6 @@
 
         # Nuke all subscriptions of this person.
         removals = [
-            ('BountySubscription', 'person'),
             ('BranchSubscription', 'person'),
             ('BugSubscription', 'person'),
             ('QuestionSubscription', 'person'),
@@ -2872,6 +2859,11 @@
             ''' % vars())
 
     def _mergeBountySubscriptions(self, cur, from_id, to_id):
+        # XXX: JonathanLange 2009-08-31: Even though all of the other bounty
+        # code has been removed from Launchpad, the merging code has to stay
+        # until the tables themselves are removed. Otherwise, the person
+        # merging code raises consistency errors (and rightly so).
+        #
         # Update only the BountySubscriptions that will not conflict.
         cur.execute('''
             UPDATE BountySubscription
@@ -3303,7 +3295,7 @@
 
         # These rows are in a UNIQUE index, and we can only move them
         # to the new Person if there is not already an entry. eg. if
-        # the destination and source persons are both subscribed to a bounty,
+        # the destination and source persons are both subscribed to a bug,
         # we cannot change the source persons subscription. We just leave them
         # as noise for the time being.
 
@@ -3333,12 +3325,12 @@
         self._mergeBranchSubscription(cur, from_id, to_id)
         skip.append(('branchsubscription', 'person'))
 
+        self._mergeBugAffectsPerson(cur, from_id, to_id)
+        skip.append(('bugaffectsperson', 'person'))
+
         self._mergeBountySubscriptions(cur, from_id, to_id)
         skip.append(('bountysubscription', 'person'))
 
-        self._mergeBugAffectsPerson(cur, from_id, to_id)
-        skip.append(('bugaffectsperson', 'person'))
-
         self._mergeAnswerContact(cur, from_id, to_id)
         skip.append(('answercontact', 'person'))
 

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2009-08-24 03:18:41 +0000
+++ lib/lp/registry/model/product.py	2009-08-28 06:16:06 +0000
@@ -60,7 +60,6 @@
 from canonical.launchpad.database.packaging import Packaging
 from lp.registry.model.pillar import HasAliasMixin
 from lp.registry.model.person import Person
-from canonical.launchpad.database.productbounty import ProductBounty
 from lp.registry.model.productlicense import ProductLicense
 from lp.registry.model.productrelease import ProductRelease
 from lp.registry.model.productseries import ProductSeries
@@ -557,10 +556,6 @@
                 drivers.add(self.owner)
         return sorted(drivers, key=lambda driver: driver.displayname)
 
-    bounties = SQLRelatedJoin(
-        'Bounty', joinColumn='product', otherColumn='bounty',
-        intermediateTable='ProductBounty')
-
     @property
     def sourcepackages(self):
         from lp.registry.model.sourcepackage import SourcePackage
@@ -937,14 +932,6 @@
             DistroSeries.distributionID == Distribution.id
             ).config(distinct=True).order_by(Distribution.name)
 
-    def ensureRelatedBounty(self, bounty):
-        """See `IProduct`."""
-        for curr_bounty in self.bounties:
-            if bounty.id == curr_bounty.id:
-                return None
-        ProductBounty(product=self, bounty=bounty)
-        return None
-
     def setBugSupervisor(self, bug_supervisor, user):
         """See `IHasBugSupervisor`."""
         self.bug_supervisor = bug_supervisor

=== modified file 'lib/lp/registry/model/project.py'
--- lib/lp/registry/model/project.py	2009-08-24 03:59:31 +0000
+++ lib/lp/registry/model/project.py	2009-08-28 06:16:06 +0000
@@ -57,7 +57,6 @@
 from lp.registry.model.pillar import HasAliasMixin
 from lp.registry.model.product import Product
 from lp.registry.model.productseries import ProductSeries
-from canonical.launchpad.database.projectbounty import ProjectBounty
 from lp.blueprints.model.specification import (
     HasSpecificationsMixin, Specification)
 from lp.blueprints.model.sprint import HasSprintsMixin
@@ -125,10 +124,6 @@
 
     # convenient joins
 
-    bounties = SQLRelatedJoin('Bounty', joinColumn='project',
-                            otherColumn='bounty',
-                            intermediateTable='ProjectBounty')
-
     @property
     def products(self):
         return Product.selectBy(project=self, active=True, orderBy='name')
@@ -136,14 +131,6 @@
     def getProduct(self, name):
         return Product.selectOneBy(project=self, name=name)
 
-    def ensureRelatedBounty(self, bounty):
-        """See `IProject`."""
-        for curr_bounty in self.bounties:
-            if bounty.id == curr_bounty.id:
-                return None
-        ProjectBounty(project=self, bounty=bounty)
-        return None
-
     @property
     def drivers(self):
         """See `IHasDrivers`."""
@@ -497,7 +484,7 @@
         """Search through the Registry database for projects that match the
         query terms. text is a piece of text in the title / summary /
         description fields of project (and possibly product). soyuz,
-        bounties, bazaar, malone etc are hints as to whether the search
+        bazaar, malone etc are hints as to whether the search
         should be limited to projects that are active in those Launchpad
         applications.
         """

=== removed file 'lib/lp/registry/templates/bounty-link.pt'
--- lib/lp/registry/templates/bounty-link.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/bounty-link.pt	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-
-    <metal:portlets fill-slot="portlets">
-      <div tal:replace="structure context/@@+portlet-bounties" />
-    </metal:portlets>
-
-<div metal:fill-slot="main">
-
-      <h1>Link a bounty</h1>
-
-  <div metal:use-macro="context/@@launchpad_addform/addform">
-
-    <p metal:fill-slot="extra_info">
-      A bounty that has already been created can be associated with
-      <span tal:replace="context/displayname">Ubuntu</span>.
-    </p>
-
-  </div>
-
-</div>
-    
-</body>
-</html>
-<!-- 1-0 done -->

=== removed file 'lib/lp/registry/templates/object-portlet-bounties.pt'
--- lib/lp/registry/templates/object-portlet-bounties.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/object-portlet-bounties.pt	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<div
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-bounties"
-  tal:condition="context/bounties">
-
-  <h2><span tal:replace="context/displayname">Ubuntu</span> bounties</h2>
-
-  <div class="portletBody portletContent">
-
-    <ul>
-      <li class="bounty" tal:repeat="bounty context/bounties">
-        <a tal:content="bounty/title"
-           tal:attributes="title bounty/summary;
-                           href bounty/fmt:url">bounty title</a>
-      </li>
-    </ul>
-
-    <ul><li class="info">
-    <a href="+bounties"
-        title="More bounties...">
-        More...
-    </a>
-    </li></ul>
-
-  </div>
-</div>

=== removed file 'lib/lp/registry/templates/person-bounties.pt'
--- lib/lp/registry/templates/person-bounties.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/person-bounties.pt	1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-  <body>
-    <metal:heading fill-slot="pageheading">
-      <h1>Bounties issued and claimed</h1>
-    </metal:heading>
-
-<metal:leftportlets fill-slot="portlets_one">
-</metal:leftportlets>
-
-<div metal:fill-slot="main">
-
-      <p>
-        These are the bounties related to
-        <tal:person replace="context/displayname">Foo Bar</tal:person>.
-      </p>
-
-  <tal:block condition="view/no_bounties">
-    <p>No bounties associated with <span
-    tal:replace="context/displayname">Mark Shuttleworth</span>.</p>
-  </tal:block>
-
-  <tal:block condition="context/ownedBounties">
-    <h2>Bounties issued</h2>
-
-      <table width="100%" class="listing sortable" id="issued">
-        <thead>
-          <tr>
-            <th>Date Created</th>
-            <th>Title</th>
-            <th>USD Value<sup>*</sup></th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:repeat="bounty context/ownedBounties">
-            <td tal:content="bounty/datecreated/fmt:date">
-              date
-            </td>
-            <td><a tal:content="bounty/title/fmt:shorten/45"
-                   tal:attributes="href bounty/fmt:url">title</a>
-            </td>
-            <td tal:content="bounty/usdvalue">usdvalue</td>
-          </tr>
-        </tbody>
-    </table>
-  </tal:block>
-
-  <tal:block condition="context/claimedBounties">
-    <h2>Bounties claimed</h2>
-
-    <table width="100%" class="listing sortable" id="claimed">
-      <thead>
-        <tr>
-          <th>Date Created</th>
-          <th>Title</th>
-          <th>USD Value<sup>*</sup></th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="bounty context/claimedBounties">
-          <td tal:content="bounty/datecreated/fmt:date">
-            date
-          </td>
-          <td><a tal:content="bounty/title/fmt:shorten/45"
-                 tal:attributes="href bounty/fmt:url">title</a>
-          </td>
-          <td tal:content="bounty/usdvalue">usdvalue</td>
-        </tr>
-      </tbody>
-    </table>
-  </tal:block>
-
-  <tal:block condition="context/reviewerBounties">
-    <h2>Bounties reviewed</h2>
-
-    <table width="100%" class="listing sortable" id="reviewer">
-      <thead>
-        <tr>
-          <th>Date Created</th>
-          <th>Title</th>
-          <th>USD Value<sup>*</sup></th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="bounty context/reviewerBounties">
-          <td tal:content="bounty/datecreated/fmt:date">
-            date
-          </td>
-          <td><a tal:content="bounty/title/fmt:shorten/45"
-                 tal:attributes="href bounty/fmt:url">title</a>
-          </td>
-          <td tal:content="bounty/usdvalue">usdvalue</td>
-        </tr>
-      </tbody>
-    </table>
-  </tal:block>
-
-  <tal:block condition="context/subscribedBounties">
-    <h2>Bounties subscribed</h2>
-
-    <table width="100%" class="listing sortable" id="subscribed">
-      <thead>
-        <tr>
-          <th>Date Created</th>
-          <th>Title</th>
-          <th>USD Value<sup>*</sup></th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="bounty context/subscribedBounties">
-          <td tal:content="bounty/datecreated/fmt:date">
-            date
-          </td>
-          <td><a tal:content="bounty/title/fmt:shorten/45"
-                 tal:attributes="href bounty/fmt:url">title</a>
-          </td>
-          <td tal:content="bounty/usdvalue">usdvalue</td>
-        </tr>
-      </tbody>
-    </table>
-  </tal:block>
-
-  <tal:block condition="not: view/no_bounties">
-    <p><sup>*</sup> A bounty may include contributions in several
-    currencies. Values are estimates of the bounty value in US Dollars
-    based on recent exchange rates.</p>
-
-    <p>You can subscribe to
-    a bounty to receive email updates of changes in status of the bounty, or
-    to have the bounty show up on your personalised Launchpad overview
-    page.</p>
-  </tal:block>
-  
-  <p>For more information on bounties in the Launchpad, see the Launchpad
-  <a href="/bounties">bounty tracker</a>.</p>
-
-</div>
-
-</body>
-</html>

=== removed file 'lib/lp/registry/templates/related-bounties.pt'
--- lib/lp/registry/templates/related-bounties.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/related-bounties.pt	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad"
->
-
-<body>
-
-<tal:x replace="nothing">
-<!-- NB maintainer, this page is used to show bounties that are related to
-project, products *and* distributions. Make sure that your changes will work
-with all of these context objects.-->
-</tal:x>
-
-<metal:leftportlets fill-slot="portlets" />
-
-<div metal:fill-slot="main">
-
-  <h1>Bounties related to <tal:thing replace="context/displayname" /></h1>
-
-  <tal:block condition="context/bounties">
-
-    <table width="100%" class="listing sortable" id="bountylist">
-      <thead>
-        <tr>
-          <th>Date Created</th>
-          <th>Title</th>
-          <th>USD Value<sup>*</sup></th>
-          <th>Difficulty</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="bounty context/bounties">
-          <td tal:content="bounty/datecreated/fmt:date">date</td>
-          <td><a tal:content="bounty/title/fmt:shorten/45"
-                 tal:attributes="href bounty/fmt:url">title</a></td>
-          <td tal:content="bounty/usdvalue">usdvalue</td>
-          <td tal:content="bounty/difficulty/title">difficulty</td>
-        </tr>
-      </tbody>
-    </table>
-
-    <p><sup>*</sup> A bounty may include contributions in several currencies,
-    this is an estimate of the bounty value in US Dollars based on recent
-    exchange rates.</p>
-
-    <p>Click on a bounty for further information. You can subscribe to
-    a bounty to receive email updates of changes in status of the bounty, or
-    to have the bounty show up on your personalised Launchpad overview
-    page.</p>
-
-  </tal:block>
-
-  <tal:block condition="not: context/bounties">
-
-    <p>
-      No bounties are currently registered for
-      <span tal:replace="context/displayname">Mozilla</span>.
-    </p>
-
-    <p>
-      Know of a bounty that should be listed here?
-      <a href="+addbounty">Register it in Launchpad</a>,
-      so it&rsquo;s easier for people to find.
-    </p>
-
-  </tal:block>
-
-</div>
-
-</body>
-</html>

=== removed file 'lib/lp/soyuz/stories/soyuz/xx-distribution-bounties.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distribution-bounties.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distribution-bounties.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-Check if the distribution bounties is not broken.
-
-#  >>> browser.open("http://localhost/distros/ubuntu")
-#  >>> browser.getLink("Bounties").click()
-#  >>> browser.url
-#  'http://localhost/distros/ubuntu/+bounties'
-#  >>> browser.contents
-#  '...Bounties related to Ubuntu...'
-

=== modified file 'lib/lp/translations/browser/potemplate.py'
--- lib/lp/translations/browser/potemplate.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/browser/potemplate.py	2009-08-27 07:05:16 +0000
@@ -139,11 +139,6 @@
         specifications_link.target = self.target
         return specifications_link
 
-    def bounties(self):
-        bounties_link = self.target_facets.bounties()
-        bounties_link.target = self.target
-        return bounties_link
-
     def calendar(self):
         calendar_link = self.target_facets.calendar()
         calendar_link.target = self.target

=== modified file 'lib/sqlobject/__init__.py'
--- lib/sqlobject/__init__.py	2009-06-25 05:59:58 +0000
+++ lib/sqlobject/__init__.py	2009-08-27 07:05:16 +0000
@@ -17,10 +17,6 @@
 sys.modules['sqlobject.sqlbuilder'] = sys.modules['sqlobject']
 del sys
 
-# This one is wrong, but CurrencyCol is only used in the bounty
-# tracker so it isn't important.
-CurrencyCol = FloatCol
-
 _sqlStringReplace = [
     ('\\', '\\\\'),
     ("'", "''"),

=== modified file 'scripts/close-account.py'
--- scripts/close-account.py	2009-06-30 16:56:07 +0000
+++ scripts/close-account.py	2009-08-27 07:05:16 +0000
@@ -112,7 +112,6 @@
         ('GpgKey', 'owner'),
 
         # Subscriptions
-        ('BountySubscription', 'person'),
         ('BranchSubscription', 'person'),
         ('BugSubscription', 'person'),
         ('QuestionSubscription', 'person'),