Merge lp:~adeuring/launchpad/bug-511269 into lp:launchpad

[Abel Deuring]

This branches fixes bug 511269: "only bug supervisor should be able to
assign bugs to other people".

As discussed in the bug report, I limited the right to set anybody as
a bug task assign not only to the bug supoervisor of a project or
distribution, but allowed that also for the project owner and the driver
of project/distro and of serieses for Launchpad admins.

Regular users can now assign only themselves and their teams; similary,
they can unassign only themselves and their teams.

Implementation details:

I needed a vocabulary that enumerates all teams where a user is a member.
This vocabulary must implement IHugeVocabulary because the server-side
machinery accessed by Javascript popups to select an assignee call a
method searchForTerms() which is only defined for IHugeVocabulary. Also,
the existing vocabulary UserTeamsParticipationVocabulary contains only
public teams, while we should allow users to set private teams as
assignees too, so I wrote a new class AllUserTeamsParticipationVocabulary.

The test for this class looks a bit ugly because of bug 583502.

The "core change" is a
I added a permission check in BugTask.transitionToAssignee() which
implements the rules for different as described above. Since there are
also some UI changes where we need to know if a given user can assign
anybody or not, I moved the actual check to two new methods
userCanSetAnyAssignee() and userCanUnassign() which are also called by some
browser class methods.

We want to show only those assignee related options a user can acutally
set or which show the current status.

Thus I changed the template l/c/l/templates/bugtask-assignee-widget.pt
so that the "unassign" radio button is only shown if there is at present
no assignee or if the current user can unassign the current assignee.

Similary, the input field to set any assignee is only shown for persons
who can set any assignee and for those regular users that are a member
of at least one team.

The input validation for the assignee field now must check against different
vocabularies for different users (AllUserTeamsParticipationVocabulary for
regular users; ValidPersonOrTeam for users with "superpowers"); this required
a change in the class BugTaskEditView.

Similary, we want to display only settable options via Javascript, so
I extended to configuration data for the YUI widget to select a user
in class BugTaskTableRowView.

Finally, I modified the YUI widget to set the assignee so that only those
options are shown which the user can actually set. Windmill tests for
these changes will follow in another branch -- this one is already longer
than recommended...

./bin/test -vvt test_bugtask
./bin/test -vvt xx-change-assignee.txt
./bin/test -vvt bugtask.txt
./bin/test -vvt test_user_vocabularies

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/javascript/bugs/bugtask-index.js
  lib/canonical/launchpad/templates/bugtask-assignee-widget.pt
  lib/canonical/widgets/bugtask.py
  lib/lp/bugs/configure.zcml
  lib/lp/bugs/browser/bugtask.py
  lib/lp/bugs/browser/tests/test_bugtask.py
  lib/lp/bugs/interfaces/bugtask.py
  lib/lp/bugs/model/bugtask.py
  lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt
  lib/lp/bugs/tests/test_bugtask.py
  lib/lp/registry/vocabularies.py
  lib/lp/registry/vocabularies.zcml
  lib/lp/registry/tests/test_user_vocabularies.py

== JSLint notices ==
jslint: No problem found in '/home/abel/canonical/lp-branches/bug-511269/lib/canonical/launchpad/javascript/bugs/bugtask-index.js'.

jslint: 1 file to lint.

== Pylint notices ==

lib/canonical/widgets/bugtask.py
    510: [E1002, AssigneeDisplayWidget.__init__] Use super on an old style class
    538: [E1002, DBItemDisplayWidget.__init__] Use super on an old style class

lib/lp/bugs/browser/bugtask.py
    1204: [E1002, BugTaskEditView.initialize] Use super on an old style class
    1301: [E1002, BugTaskEditView.setUpFields] Use super on an old style class

lib/lp/bugs/browser/tests/test_bugtask.py
    29: [E1002, TestBugTasksAndNominationsView.setUp] Use super on an old style class
    218: [E1002, TestBugTaskEditViewStatusField.setUp] Use super on an old style class
    304: [E1002, TestBugTaskEditViewAssigneeField.setUp] Use super on an old style class

lib/lp/bugs/interfaces/bugtask.py
    1238: [C0322, BugTaskSearchParams.fromSearchForm] Operator not preceded by a space
    search_params.linked_branches=linked_branches
    ^

lib/lp/bugs/tests/test_bugtask.py
    32: [E1002, TestBugTaskDelta.setUp] Use super on an old style class
    475: [E1002, TestBugTaskHardwareSearch.setUp] Use super on an old style class
    507: [E1002, TestBugTaskPermissionsToSetAssigneeBase.setUp] Use super on an old style class

[Graham Binns (gmb)]

review: Approve (code)

[Abel Deuring (adeuring)]

sorry, I clicked "resubmit" too early. I ahd to fix several test failures; most of them qre quite obvious: The branch limits most people to (un)assign only themselves; several tests assumed that everybody can assigned anybody else. So, most changes just ensure that this new constraint is fulfilled.

In addition, I added the celebrity bug_importer to the group of "persons" which can set any assignee.

Finally, I removed the module sftracker, because a test of it failed too. Since it is no longer used, I removed it instead of trying to figure out how to best fix the test...

the incremental diff since the last review:

=== removed file 'lib/canonical/launchpad/scripts/sftracker.py'
--- lib/canonical/launchpad/scripts/sftracker.py 2009-10-26 18:40:04 +0000
+++ lib/canonical/launchpad/scripts/sftracker.py 1970-01-01 00:00:00 +0000
@@ -1,448 +0,0 @@
-# Copyright 2009 Canonical Ltd. This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Sourceforge.net Tracker import logic.
-
-This code relies on the output of Frederik Lundh's Sourceforge tracker
-screen-scraping tools:
-
- http://effbot.org/zone/sandbox-sourceforge.htm
-"""
-
-# XXX: jamesh 2007-01-10:
-# It would be good to change this code so that it generates an XML
-# dump suitable for use with the bug-import.py script. This would
-# reduce the number of bug importers we need to manage.
-
-__metaclass__ = type
-
-__all__ = [
- 'Tracker',
- 'TrackerImporter'
- ]
-
-from cStringIO import StringIO
-import datetime
-import logging
-import os
-import re
-import time
-
-import pytz
-
-from storm.store import Store
-
-# use cElementTree if it is available ...
-try:
- import xml.etree.cElementTree as ET
-except ImportError:
- try:
- import cElementTree as ET
- except ImportError:
- import elementtree.ElementTree as ET
-
-from zope.component import getUtility
-from zope.contenttype import guess_content_type
-
-from canonical.database.constants import UTC_NOW
-from canonical.launchpad.interfaces import (
- BugAttachmentType, BugTaskImportance, BugTaskStatus, CreateBugParams,
- IBugActivitySet, IBugAttachmentSet, IBugSet, IEmailAddressSet,
- ILaunchpadCelebrities, ILibraryFileAliasSet, IMessageSet, IPersonSet,
- NotFoundError, PersonCreationRationale)
-
-logger = logging.getLogger('canonical.launchpad.scripts.sftracker')
-
-# when accessed anonymously, Sourceforge returns dates in this time zone:
-SOURCEFORGE_TZ = pytz.timezone('US/Pacific')
-UTC = pytz.timezone('UTC')
-
-
-def parse_date(datestr):
- if datestr in ['', 'No updates since submission']:
- return None
- year, month, day, hour, minute = time.strptime(datestr,
- '%Y-%m-%d %H:%M')[:5]
- dt = datetime.datetime(year, month, day, hour, minute)
- return SOURCEFORGE_TZ.localize(dt).astimezone(UTC)
-
-
-def sanitise_name(name):
- """Sanitise a string to pass the valid_name() constraint"""
- name = re.sub(r'[^a-z0-9\+\.\-]+', '-', name.lower())
- if not name[0].isalnum():
- name = 'x' + name
- while name.endswith('-'):
- name = name[:-1]
- return name
...

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2010-04-29 17:49:19 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2010-06-04 09:33:28 +0000
@@ -1446,17 +1446,31 @@
         milestone_choice_edit.render();
     }
     if (Y.Lang.isValue(assignee_content)) {
+        var step_title =
+            (conf.assignee_vocabulary == 'ValidAssignee') ?
+            "Search for people or teams" :
+            "Select a team of which you are a member";
         var assignee_picker = Y.lp.picker.addPickerPatcher(
-            'ValidAssignee',
+            conf.assignee_vocabulary,
             conf.bugtask_path,
             "assignee_link",
             assignee_content.get('id'),
-            true,
-            true,
-            {"step_title": "Search for people or teams",
+            conf.user_can_unassign,
+            true,
+            {"step_title": step_title,
                 "header": "Change assignee",
                 "remove_button_text": "Remove assignee",
                 "null_display_value": "Unassigned"});
+        // Ordinary users can select only themselves and their teams.
+        // Do not show the team selection, if a user is not a member
+        // of any team,
+        if (conf.hide_assignee_team_selection) {
+            content_box = assignee_picker.get('contentBox');
+            search_box = content_box.one('.yui-picker-search-box');
+            search_box.setStyle('display', 'none');
+            step_title = content_box.one('.contains-steptitle');
+            step_title.setStyle('display', 'none');
+        }
         assignee_picker.render();
     }
 };

=== removed file 'lib/canonical/launchpad/scripts/sftracker.py'
--- lib/canonical/launchpad/scripts/sftracker.py	2009-10-26 18:40:04 +0000
+++ lib/canonical/launchpad/scripts/sftracker.py	1970-01-01 00:00:00 +0000
@@ -1,448 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Sourceforge.net Tracker import logic.
-
-This code relies on the output of Frederik Lundh's Sourceforge tracker
-screen-scraping tools:
-
-  http://effbot.org/zone/sandbox-sourceforge.htm
-"""
-
-# XXX: jamesh 2007-01-10:
-# It would be good to change this code so that it generates an XML
-# dump suitable for use with the bug-import.py script.  This would
-# reduce the number of bug importers we need to manage.
-
-__metaclass__ = type
-
-__all__ = [
-    'Tracker',
-    'TrackerImporter'
-    ]
-
-from cStringIO import StringIO
-import datetime
-import logging
-import os
-import re
-import time
-
-import pytz
-
-from storm.store import Store
-
-# use cElementTree if it is available ...
-try:
-    import xml.etree.cElementTree as ET
-except ImportError:
-    try:
-        import cElementTree as ET
-    except ImportError:
-        import elementtree.ElementTree as ET
-
-from zope.component import getUtility
-from zope.contenttype import guess_content_type
-
-from canonical.database.constants import UTC_NOW
-from canonical.launchpad.interfaces import (
-    BugAttachmentType, BugTaskImportance, BugTaskStatus, CreateBugParams,
-    IBugActivitySet, IBugAttachmentSet, IBugSet, IEmailAddressSet,
-    ILaunchpadCelebrities, ILibraryFileAliasSet, IMessageSet, IPersonSet,
-    NotFoundError, PersonCreationRationale)
-
-logger = logging.getLogger('canonical.launchpad.scripts.sftracker')
-
-# when accessed anonymously, Sourceforge returns dates in this time zone:
-SOURCEFORGE_TZ = pytz.timezone('US/Pacific')
-UTC = pytz.timezone('UTC')
-
-
-def parse_date(datestr):
-    if datestr in ['', 'No updates since submission']:
-        return None
-    year, month, day, hour, minute = time.strptime(datestr,
-                                                   '%Y-%m-%d %H:%M')[:5]
-    dt = datetime.datetime(year, month, day, hour, minute)
-    return SOURCEFORGE_TZ.localize(dt).astimezone(UTC)
-
-
-def sanitise_name(name):
-    """Sanitise a string to pass the valid_name() constraint"""
-    name = re.sub(r'[^a-z0-9\+\.\-]+', '-', name.lower())
-    if not name[0].isalnum():
-        name = 'x' + name
-    while name.endswith('-'):
-        name = name[:-1]
-    return name
-
-
-def gettext(elem):
-    if elem is not None:
-        value = elem.text.strip()
-        # exported data contains escaped HTML entities.
-        value = value.replace('"', '"')
-        value = value.replace(''', '\'')
-        value = value.replace('&lt;', '<')
-        value = value.replace('&gt;', '>')
-        value = value.replace('&amp;', '&')
-        return value
-    else:
-        return ''
-
-
-class TrackerAttachment:
-    """An attachment associated with a SF tracker item"""
-
-    def __init__(self, attachment_node):
-        self.file_id = attachment_node.get('file_id')
-        self._content_type = gettext(attachment_node.find('content_type'))
-        self.filename = gettext(attachment_node.find('title'))
-        if not self.filename:
-            self.filename = 'untitled'
-        self.title = gettext(attachment_node.find('description'))
-        if not self.title:
-            self.title = self.filename
-        self.date = parse_date(gettext(attachment_node.find('date')))
-        self.sender = gettext(attachment_node.find('sender'))
-        self.data = gettext(attachment_node.find('data')).decode('base-64')
-
-    @property
-    def is_patch(self):
-        """True if this attachment is a patch
-
-        As the sourceforge tracker does not differentiate between
-        patches and other attachments, we need to use heuristics to
-        differentiate.
-        """
-        return (self.filename.endswith('patch') or
-                self.filename.endswith('diff'))
-
-    @property
-    def content_type(self):
-        # always treat patches as text/plain
-        if self.is_patch:
-            return 'text/plain'
-
-        # if we have no content type, or it is application/octet-stream,
-        # sniff the content type
-        if (self._content_type is None or
-            self._content_type.startswith('application/octet-stream')):
-            content_type, encoding = guess_content_type(
-                name=self.filename, body=self.data)
-            return content_type
-
-        # otherwise, trust SourceForge.
-        return self._content_type
-
-
-class TrackerItem:
-    """An SF tracker item"""
-
-    def __init__(self, item_node, summary_node):
-        self.url = 'http://sourceforge.net' + gettext(
-            summary_node.find('link'))
-        self.item_id = item_node.get('id')
-        self.datecreated = parse_date(gettext(
-            item_node.find('date_submitted')))
-        self.date_last_updated = parse_date(gettext(
-            item_node.find('date_last_updated')))
-        self.title = gettext(item_node.find('summary'))
-        self.description = gettext(item_node.find('description'))
-        self.category = gettext(item_node.find('category'))
-        self.group = gettext(item_node.find('group'))
-        self.priority = gettext(item_node.find('priority'))
-        self.resolution = gettext(item_node.find('resolution'))
-        self.status = gettext(item_node.find('status'))
-        # We get these two from the summary file because it contains user IDs
-        self.reporter = gettext(summary_node.find('submitted_by'))
-        self.assignee = gettext(summary_node.find('assigned_to'))
-        # initial comment:
-        self.comments = [(self.datecreated, self.reporter, self.description)]
-        # remaining comments ...
-        for comment_node in item_node.findall('comment'):
-            dt = parse_date(gettext(comment_node.find('date')))
-            sender = gettext(comment_node.find('sender'))
-            description = gettext(comment_node.find('description'))
-            # remove recognised headers from description
-            lines = description.splitlines(True)
-            while lines and (lines[0].startswith('Date:') or
-                             lines[0].startswith('Sender:') or
-                             lines[0].startswith('Logged In:') or
-                             lines[0].startswith('user_id=')
-                             or lines[0].isspace()):
-                del lines[0]
-            description = ''.join(lines)
-            self.comments.append((dt, sender, description))
-        # attachments
-        self.attachments = [TrackerAttachment(node)
-                            for node in item_node.findall('attachment')]
-
-    @property
-    def lp_importance(self):
-        """The Launchpad importance value for this item"""
-        try:
-            priority = int(self.priority)
-        except ValueError:
-            return BugTaskImportance.UNTRIAGED
-        # make priority >= 9 CRITICAL
-        if priority >= 9:
-            return BugTaskImportance.CRITICAL
-        elif priority >= 7:
-            return BugTaskImportance.HIGH
-        elif priority >= 4:
-            return BugTaskImportance.MEDIUM
-        else:
-            return BugTaskImportance.LOW
-
-    @property
-    def lp_status(self):
-        if self.status == 'Open':
-            if self.resolution == 'Accepted' or self.assignee != 'nobody':
-                return BugTaskStatus.CONFIRMED
-            else:
-                return BugTaskStatus.NEW
-        elif self.status == 'Closed':
-            if self.resolution in ['Accepted', 'Fixed', 'None']:
-                return BugTaskStatus.FIXRELEASED
-            else:
-                return BugTaskStatus.INVALID
-        elif self.status == 'Deleted':
-            # "Duplicate" bugs are marked deleted.  INVALID is the
-            # best fit for this.
-            return BugTaskStatus.INVALID
-        elif self.status == 'Pending':
-            if self.resolution in ['Fixed', 'None']:
-                return BugTaskStatus.FIXCOMMITTED
-            else:
-                return BugTaskStatus.INPROGRESS
-        raise AssertionError('Unhandled item status: (%s, %s)'
-                             % (self.status, self.resolution))
-
-
-class Tracker:
-    """An SF tracker"""
-
-    def __init__(self, dumpfile, dumpdir=None):
-        """Create a Tracker instance.
-
-        Dumpfile is a dump of the tracker as generated by xml-export.py
-        Dumpdir contains the individual tracker item XML files.
-        """
-        self.data = ET.parse(dumpfile).getroot()
-        if dumpdir is None:
-            self.dumpdir = os.path.join(os.path.dirname(dumpfile),
-                                        self.data.get('id'))
-        else:
-            self.dumpdir = dumpdir
-
-    def __iter__(self):
-        """Yield TrackerItem instances for the bugs in this tracker."""
-        for item_node in self.data.findall('item'):
-            # open the summary file
-            item_id = item_node.get('id')
-            summary_file = os.path.join(self.dumpdir, 'item-%s.xml' % item_id)
-            summary_node = ET.parse(summary_file)
-            yield TrackerItem(item_node, summary_node)
-
-
-class TrackerImporter:
-    """Helper class for importing SF tracker items into Launchpad"""
-
-    def __init__(self, product, verify_users=False):
-        self.product = product
-        self.verify_users = verify_users
-        self._person_id_cache = {}
-        self.bug_importer = getUtility(ILaunchpadCelebrities).bug_importer
-
-    def get_person(self, sf_userid):
-        """Get the Launchpad user corresponding to the given SF user ID"""
-        if sf_userid in [None, '', 'nobody']:
-            return None
-
-        email = '[e-mail]' % sf_userid
-
-        launchpad_id = self._person_id_cache.get(sf_userid)
-        if launchpad_id is not None:
-            person = getUtility(IPersonSet).get(launchpad_id)
-            if person is not None and person.merged is not None:
-                person = None
-        else:
-            person = None
-
-        if person is None:
-            person = getUtility(IPersonSet).getByEmail(email)
-            if person is None:
-                logger.debug('creating person for %s' % email)
-                person = getUtility(IPersonSet).ensurePerson(
-                    email=email, displayname=None,
-                    rationale=PersonCreationRationale.BUGIMPORT,
-                    comment='when importing bugs for %s from SourceForge.net'
-                            % self.product.displayname)
-            self._person_id_cache[sf_userid] = person.id
-
-        # if we are auto-verifying new accounts, make sure the person
-        # has a preferred email
-        if self.verify_users and person.preferredemail is None:
-            emailaddr = getUtility(IEmailAddressSet).getByEmail(email)
-            assert emailaddr is not None
-            person.setPreferredEmail(emailaddr)
-
-        return person
-
-    def getMilestone(self, name):
-        if name in ['None', '', None]:
-            return None
-
-        # turn milestone into a Launchpad name
-        name = sanitise_name(name)
-
-        milestone = self.product.getMilestone(name)
-        if milestone is not None:
-            return milestone
-
-        # pick a series to attach the milestone.  Pick 'trunk' or
-        # 'main' if they exist.  Otherwise pick the first.
-        # pylint: disable-msg=W0631
-        for series in self.product.series:
-            if series.name in ['trunk', 'main']:
-                break
-        else:
-            series = self.product.series[0]
-
-        milestone = series.newMilestone(name)
-        Store.of(milestone).flush()
-        return milestone
-
-    def createMessage(self, subject, date, userid, text):
-        """Create an IMessage for a particular comment."""
-        if not text.strip():
-            text = '<empty comment>'
-        owner = self.get_person(userid)
-        if owner is None:
-            owner = self.bug_importer
-        return getUtility(IMessageSet).fromText(subject, text, owner, date)
-
-    def importTrackerItem(self, item):
-        """Import an SF tracker item into Launchpad.
-
-        We identify SF tracker items by setting their nick name to
-        'sf1234' where the SF item id was 1234.  If such a bug already
-        exists, the import is skipped.
-        """
-        logger.info('Handling Sourceforge tracker item #%s', item.item_id)
-
-        nickname = 'sf%s' % item.item_id
-        try:
-            bug = getUtility(IBugSet).getByNameOrID(nickname)
-        except NotFoundError:
-            bug = None
-
-        if bug is not None:
-            logger.info('Sourceforge bug %s has already been imported as #%d',
-                        item.item_id, bug.id)
-            return bug
-
-        comments_by_date_and_user = {}
-        comments = list(item.comments)
-
-        # The first comment is used as the bug description, so we pop
-        # it off the list.
-        date, userid, text = comments.pop(0)
-        # Add a link back to the original SourceForge bug report:
-        text = text + '\n\n[' + item.url + ']'
-        msg = self.createMessage(item.title, date, userid, text)
-        comments_by_date_and_user[(date, userid)] = msg
-
-        owner = self.get_person(item.reporter)
-        # LP bugs can't have no reporter ...
-        if owner is None:
-            owner = self.bug_importer
-
-        bug = self.product.createBug(CreateBugParams(
-            msg=msg,
-            datecreated=item.datecreated,
-            title=item.title,
-            owner=owner))
-        bug.name = nickname
-        bugtask = bug.bugtasks[0]
-        logger.info('Creating Launchpad bug #%d', bug.id)
-
-        # attach comments and create CVE links.
-        bug.findCvesInText(text, bug.owner)
-        for (date, userid, text) in comments:
-            msg = self.createMessage(bug.followup_subject(), date,
-                                      userid, text)
-            bug.linkMessage(msg)
-            comments_by_date_and_user[(date, userid)] = msg
-
-        # set up bug task
-        bugtask.datecreated = item.datecreated
-        bugtask.transitionToImportance(item.lp_importance, self.bug_importer)
-        bugtask.transitionToStatus(item.lp_status, self.bug_importer)
-        bugtask.transitionToAssignee(self.get_person(item.assignee))
-
-        # Convert the category to a tag name
-        if item.category not in ['None', '', None]:
-            bug.tags = [sanitise_name(item.category)]
-
-        # Convert group to a milestone
-        bugtask.milestone = self.getMilestone(item.group)
-
-        # Convert attachments
-        for attachment in item.attachments:
-            if attachment.is_patch:
-                attach_type = BugAttachmentType.PATCH
-            else:
-                attach_type = BugAttachmentType.UNSPECIFIED
-
-            # do we already have the message for this bug?
-            msg = comments_by_date_and_user.get((attachment.date,
-                                                 attachment.sender))
-            if msg is None:
-                msg = self.createMessage(
-                    attachment.title,
-                    attachment.date or UTC_NOW,
-                    attachment.sender,
-                    'Other attachments')
-                bug.linkMessage(msg)
-                comments_by_date_and_user[(attachment.date,
-                                           attachment.sender)] = msg
-
-            # upload the attachment and add to the bug.
-            filealias = getUtility(ILibraryFileAliasSet).create(
-                name=attachment.filename,
-                size=len(attachment.data),
-                file=StringIO(attachment.data),
-                contentType=attachment.content_type)
-
-            getUtility(IBugAttachmentSet).create(
-                bug=bug,
-                filealias=filealias,
-                attach_type=attach_type,
-                title=attachment.title,
-                message=msg)
-
-        # Make a note of the import in the activity log:
-        getUtility(IBugActivitySet).new(
-            bug=bug.id,
-            datechanged=UTC_NOW,
-            person=self.bug_importer,
-            whatchanged='bug',
-            message='Imported SF tracker item #%s' % item.item_id)
-
-        return bug
-
-    def importTracker(self, ztm, tracker):
-        """Import bugs from the given tracker"""
-        for item in tracker:
-            ztm.begin()
-            try:
-                self.importTrackerItem(item)
-            except (SystemExit, KeyboardInterrupt):
-                raise
-            except:
-                logger.exception('Could not import item #%s', item.item_id)
-                ztm.abort()
-            else:
-                ztm.commit()

=== removed file 'lib/canonical/launchpad/scripts/tests/test_sftracker.py'
--- lib/canonical/launchpad/scripts/tests/test_sftracker.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/scripts/tests/test_sftracker.py	1970-01-01 00:00:00 +0000
@@ -1,347 +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
-
-from cStringIO import StringIO
-import datetime
-import unittest
-
-import pytz
-import transaction
-from zope.component import getUtility
-from canonical.launchpad.interfaces import (
-    BugAttachmentType, BugTaskImportance, BugTaskStatus, IEmailAddressSet,
-    ILaunchpadCelebrities, IPersonSet, IProductSet, PersonCreationRationale)
-from canonical.launchpad.scripts import sftracker
-
-from canonical.testing import LaunchpadZopelessLayer
-
-item_data = r"""
-<item id="1278591">
-    <assigned_to>Thomas Ries</assigned_to>
-    <attachment file_id="147710">
-      <content_disposition>attachment; filename=siproxd.patch</content_disposition>
-      <content_length>1327</content_length>
-      <content_type>application/octet-stream</content_type>
-      <date>2005-09-01 02:35</date>
-      <description>Patch to include Proxy-Authenticate in response</description>
-      <etag>"jpd--1645707516.1327"</etag>
-      <link>/tracker/download.php?group_id=60374&amp;atid=493974&amp;file_id=147710&amp;aid=1278591</link>
-      <sender>nobody</sender>
-      <title>siproxd.patch</title>
-      <data encoding="base64">
-LS0tIGF1dGguYy5vcmlnCTIwMDUtMDEtMDggMTE6MDU6MTIuMDAwMDAwMDAwICswMTAwCisrKyBh
-dXRoLmMJMjAwNS0wOS0wMSAxMToyNjowOC4wMDAwMDAwMDAgKzAyMDAKQEAgLTkxLDcgKzkxLDcg
-QEAKICAqCVNUU19TVUNDRVNTCiAgKglTVFNfRkFJTFVSRQogICovCi1pbnQgYXV0aF9pbmNsdWRl
-X2F1dGhycShzaXBfdGlja2V0X3QgKnRpY2tldCkgeworaW50IGF1dGhfaW5jbHVkZV9hdXRocnEo
-b3NpcF9tZXNzYWdlX3QgKnNpcG1zZykgewogICAgb3NpcF9wcm94eV9hdXRoZW50aWNhdGVfdCAq
-cF9hdXRoOwogICAgY2hhciAqcmVhbG09TlVMTDsKIApAQCAtMTEyLDcgKzExMiw3IEBACg==
-</data>
-    </attachment>
-    <attachment file_id="42">
-      <content_disposition>attachment; filename=hello.txt</content_disposition>
-      <content_length>12</content_length>
-      <content_type>application/octet-stream; extra crap at end</content_type>
-      <date>2005-10-01 08:14</date>
-      <description>A non-patch attachment</description>
-      <link>/tracker/download.php?group_id=60374&amp;atid=493974&amp;file_id=42&amp;aid=1278591</link>
-      <sender>tries</sender>
-      <title>hello.txt</title>
-      <data encoding="base64">
-SGVsbG8gV29ybGQK
-</data>
-    </attachment>
-    <category>General</category>
-    <closed_by>tries</closed_by>
-    <comment>
-      <date>2005-10-01 08:14</date>
-      <description>Date: 2005-10-01 08:14
-Sender: tries
-Logged In: YES
-user_id=438614
-
-Thanks, &amp;amp; &amp;amp;quot;
-I applied the included patch. Will be available in version
-0.5.12 or use the "daily snapshot" where is is
-included.
-
-/Thomas</description>
-      <sender>tries</sender>
-      <sender_user_id>438614</sender_user_id>
-    </comment><date_closed>2005-10-01 08:14</date_closed>
-    <date_last_updated>2005-10-01 08:14</date_last_updated>
-    <date_submitted>2005-09-01 02:35</date_submitted>
-    <description>When siproxd is used with authentication (eg.
-proxy_auth_pwfile defined) it does not set
-'Proxy-Authenticate' header in 407 code response.
-Looking into code we can see that funtion
-'auth_include_authrq' is used against 'ticket' whereas
-we send 'response' back to the client. Modyfying code
-to use response instead ticket solves the problem (see
-attached patch) Add a Comment:</description>
-    <group>siproxd-0.5.x</group>
-    <item_id>1278591</item_id>
-    <last_updated_by>tries - Comment added</last_updated_by>
-    <number_of_attachments>1</number_of_attachments>
-    <number_of_comments>1</number_of_comments>
-    <priority>5</priority>
-    <resolution>Fixed</resolution>
-    <status>Closed</status>
-    <submitted_by>Nobody/Anonymous - nobody</submitted_by>
-    <summary>Proxy-Authenticate header not included in response</summary>
-    <title>Proxy-Authenticate header not included in response</title>
-  </item>
-"""
-summary_data = r"""
-<item id="1278591"><assigned_to>tries</assigned_to><description>Proxy-Authenticate header not included in response</description><link>/tracker/index.php?func=detail&amp;aid=1278591&amp;group_id=60374&amp;atid=493974</link><priority>5</priority><status>Closed</status><submitted_by>nobody</submitted_by><timestamp>* 2005-09-01 02:35</timestamp><tracker>493974</tracker></item>
-"""
-
-UTC = pytz.timezone('UTC')
-
-
-class TrackerItemLoaderTestCase(unittest.TestCase):
-
-    def test_parse_tracker_item(self):
-        item_node = sftracker.ET.parse(StringIO(item_data)).getroot()
-        summary_node = sftracker.ET.parse(StringIO(summary_data)).getroot()
-        item = sftracker.TrackerItem(item_node, summary_node)
-
-        self.assertEqual(item.url,
-                         'http://sourceforge.net/tracker/index.php?'
-                         'func=detail&aid=1278591&group_id=60374&atid=493974')
-        self.assertEqual(item.item_id, '1278591')
-        self.assertEqual(item.reporter, 'nobody')
-        self.assertEqual(item.assignee, 'tries')
-        self.assertEqual(item.datecreated,
-                         datetime.datetime(2005, 9, 1, 9, 35, tzinfo=UTC))
-        self.assertEqual(item.title,
-                         'Proxy-Authenticate header not included in response')
-        self.assertEqual(item.category, 'General')
-        self.assertEqual(item.group, 'siproxd-0.5.x')
-        self.assertEqual(item.priority, '5')
-        self.assertEqual(item.status, 'Closed')
-        self.assertEqual(item.resolution, 'Fixed')
-        self.assertTrue(item.description.startswith(
-            'When siproxd is used with authentication'))
-
-        self.assertEqual(len(item.comments), 2)
-        self.assertEqual(item.comments[0][0],
-                         datetime.datetime(2005, 9, 1, 9, 35, tzinfo=UTC))
-        self.assertEqual(item.comments[0][1], 'nobody')
-        self.assertTrue(item.comments[0][2].startswith(
-            'When siproxd is used with authentication'))
-        self.assertEqual(item.comments[1][0],
-                         datetime.datetime(2005, 10, 1, 15, 14, tzinfo=UTC))
-        self.assertEqual(item.comments[1][1], 'tries')
-        self.assertTrue(item.comments[1][2].startswith('Thanks, & &quot;'))
-
-        self.assertEqual(len(item.attachments), 2)
-        self.assertEqual(item.attachments[0].filename, 'siproxd.patch')
-        self.assertEqual(item.attachments[0].title,
-                         'Patch to include Proxy-Authenticate in response')
-        self.assertEqual(item.attachments[0].sender, 'nobody')
-        self.assertEqual(item.attachments[0].date,
-                         datetime.datetime(2005, 9, 1, 9, 35, tzinfo=UTC))
-        self.assertEqual(item.attachments[0].is_patch, True)
-        self.assertTrue(item.attachments[0].data.startswith(
-            '--- auth.c.orig\t2005-01-08 11:05:12.000000000 +0100\n'))
-
-        self.assertEqual(item.attachments[1].filename, 'hello.txt')
-        self.assertEqual(item.attachments[1].is_patch, False)
-        self.assertEqual(item.attachments[1].content_type, 'text/plain')
-        self.assertEqual(item.attachments[1].data, 'Hello World\n')
-
-        self.assertEqual(item.lp_status, BugTaskStatus.FIXRELEASED)
-        self.assertEqual(item.lp_importance, BugTaskImportance.MEDIUM)
-
-
-class SanitiseNameTestCase(unittest.TestCase):
-
-    def test_sanitise_name(self):
-        self.assertEqual(sftracker.sanitise_name('foobar'), 'foobar')
-        self.assertEqual(sftracker.sanitise_name('Python 2.4'), 'python-2.4')
-        self.assertEqual(sftracker.sanitise_name('Core (C Code)'),
-                         'core-c-code')
-        self.assertEqual(sftracker.sanitise_name('python-2.4'), 'python-2.4')
-        self.assertEqual(sftracker.sanitise_name('1.0'), '1.0')
-        self.assertEqual(sftracker.sanitise_name('+42'), 'x+42')
-
-
-class PersonMappingTestCase(unittest.TestCase):
-
-    layer = LaunchpadZopelessLayer
-
-    def test_create_person(self):
-        # Test that person creation works
-        person = getUtility(IPersonSet).getByEmail('[e-mail]')
-        self.assertEqual(person, None)
-
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product)
-        person = importer.get_person('foo')
-        # Changes were just made to two different Stores, so commit
-        # to make the changes visible to the subsequent tests.
-        transaction.commit()
-        self.assertNotEqual(person, None)
-        self.assertEqual(person.guessedemails.count(), 1)
-        self.assertEqual(person.guessedemails[0].email,
-                         '[e-mail]')
-        self.assertEqual(person.creation_rationale,
-                         PersonCreationRationale.BUGIMPORT)
-        self.assertEqual(person.creation_comment,
-            'when importing bugs for NetApplet from SourceForge.net')
-
-    def test_find_existing_person(self):
-        person = getUtility(IPersonSet).getByEmail('[e-mail]')
-        self.assertEqual(person, None)
-        person, email = getUtility(IPersonSet).createPersonAndEmail(
-            email='[e-mail]',
-            rationale=PersonCreationRationale.OWNER_CREATED_LAUNCHPAD)
-        self.assertNotEqual(person, None)
-
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product)
-        self.assertEqual(importer.get_person('foo'), person)
-
-    def test_nobody_person(self):
-        # Test that TrackerImporter.get_person() returns None where appropriate
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product)
-        self.assertEqual(importer.get_person(None), None)
-        self.assertEqual(importer.get_person(''), None)
-        self.assertEqual(importer.get_person('nobody'), None)
-
-    def test_verify_new_person(self):
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product, verify_users=True)
-        person = importer.get_person('foo')
-        self.assertNotEqual(person, None)
-        self.assertNotEqual(person.preferredemail, None)
-        self.assertEqual(person.preferredemail.email,
-                         '[e-mail]')
-        self.assertEqual(person.creation_rationale,
-                         PersonCreationRationale.BUGIMPORT)
-        self.assertEqual(person.creation_comment,
-            'when importing bugs for NetApplet from SourceForge.net')
-
-    def test_verify_existing_person(self):
-        person = getUtility(IPersonSet).ensurePerson(
-            '[e-mail]', None,
-            PersonCreationRationale.OWNER_CREATED_LAUNCHPAD)
-        self.assertEqual(person.preferredemail, None)
-
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product, verify_users=True)
-        person = importer.get_person('foo')
-        self.assertNotEqual(person.preferredemail, None)
-        self.assertEqual(person.preferredemail.email,
-                         '[e-mail]')
-
-    def test_verify_doesnt_clobber_preferred_email(self):
-        person = getUtility(IPersonSet).ensurePerson(
-            '[e-mail]', None,
-            PersonCreationRationale.OWNER_CREATED_LAUNCHPAD)
-        transaction.commit()
-        self.failIf(person.account is None, 'Person must have an account.')
-        email = getUtility(IEmailAddressSet).new(
-            '[e-mail]', person, account=person.account)
-        person.setPreferredEmail(email)
-        transaction.commit()
-        self.assertEqual(person.preferredemail.email, '[e-mail]')
-
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product, verify_users=True)
-        person = importer.get_person('foo')
-        transaction.commit()
-        self.assertNotEqual(person.preferredemail, None)
-        self.assertEqual(person.preferredemail.email, '[e-mail]')
-
-
-class TrackerItemImporterTestCase(unittest.TestCase):
-
-    layer = LaunchpadZopelessLayer
-
-    def test_import_item(self):
-        item_node = sftracker.ET.parse(StringIO(item_data)).getroot()
-        summary_node = sftracker.ET.parse(StringIO(summary_data)).getroot()
-        item = sftracker.TrackerItem(item_node, summary_node)
-
-        # import against some product.
-        product = getUtility(IProductSet).getByName('netapplet')
-        importer = sftracker.TrackerImporter(product)
-        bug = importer.importTrackerItem(item)
-        # Creating a user makes changes to two different Stores, so we have
-        # to commit to make these changes visible (or we have to pull this
-        # information from the correct stores, which is a more tedious fix).
-        transaction.commit()
-        bugtask = bug.bugtasks[0]
-
-        self.assertEqual(bug.name, 'sf1278591')
-        # bugs submitted anonymously map to the bug importer
-        self.assertEqual(bug.owner,
-                         getUtility(ILaunchpadCelebrities).bug_importer)
-        self.assertEqual(bug.title,
-                         'Proxy-Authenticate header not included in response')
-        self.assertEqual(bug.datecreated,
-                         datetime.datetime(2005, 9, 1, 9, 35, tzinfo=UTC))
-        self.assertEqual(bug.tags, ['general'])
-
-        self.assertEqual(bugtask.product, product)
-        self.assertNotEqual(bugtask.assignee, None)
-        self.assertEqual(bugtask.assignee.guessedemails[0].email,
-                         '[e-mail]')
-        self.assertEqual(bugtask.importance, BugTaskImportance.MEDIUM)
-        self.assertEqual(bugtask.status, BugTaskStatus.FIXRELEASED)
-        self.assertNotEqual(bugtask.milestone, None)
-        self.assertEqual(bugtask.milestone.name, 'siproxd-0.5.x')
-
-        self.assertEqual(bug.messages.count(), 2)
-        comment1, comment2 = bug.messages
-        self.assertEqual(comment1.owner,
-                         getUtility(ILaunchpadCelebrities).bug_importer)
-        self.assertEqual(comment1.datecreated,
-                         datetime.datetime(2005, 9, 1, 9, 35, tzinfo=UTC))
-        self.assertTrue(comment1.text_contents.startswith(
-            'When siproxd is used with authentication'))
-
-        self.assertEqual(comment2.owner.guessedemails[0].email,
-                         '[e-mail]')
-        self.assertEqual(comment2.datecreated,
-                         datetime.datetime(2005, 10, 1, 15, 14, tzinfo=UTC))
-        self.assertTrue(comment2.text_contents.startswith('Thanks, & &quot;'))
-
-        self.assertEqual(comment1.bugattachments.count(), 1)
-        attachment = comment1.bugattachments[0]
-        self.assertEqual(attachment.bug, bug)
-        self.assertEqual(attachment.type, BugAttachmentType.PATCH)
-        self.assertEqual(attachment.title,
-                         'Patch to include Proxy-Authenticate in response')
-        self.assertEqual(attachment.libraryfile.filename, 'siproxd.patch')
-        self.assertEqual(attachment.libraryfile.mimetype, 'text/plain')
-
-        self.assertEqual(comment2.bugattachments.count(), 1)
-        attachment = comment2.bugattachments[0]
-        self.assertEqual(attachment.bug, bug)
-        self.assertEqual(attachment.type, BugAttachmentType.UNSPECIFIED)
-        self.assertEqual(attachment.libraryfile.filename, 'hello.txt')
-        self.assertEqual(attachment.libraryfile.mimetype, 'text/plain')
-
-        self.assertEqual(bug.activity.count(), 2)
-
-        # Activity record for bug creation.
-        self.assertEqual(bug.activity[0].person,
-                         getUtility(ILaunchpadCelebrities).bug_importer)
-        self.assertEqual(bug.activity[0].whatchanged, 'bug')
-        self.assertEqual(bug.activity[0].message, 'added bug')
-
-        # Activity record for importing.
-        self.assertEqual(bug.activity[1].person,
-                         getUtility(ILaunchpadCelebrities).bug_importer)
-        self.assertEqual(bug.activity[1].whatchanged, 'bug')
-        self.assertEqual(bug.activity[1].message,
-                         'Imported SF tracker item #1278591')
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/canonical/launchpad/templates/bugtask-assignee-widget.pt'
--- lib/canonical/launchpad/templates/bugtask-assignee-widget.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/bugtask-assignee-widget.pt	2010-06-04 09:33:28 +0000
@@ -4,7 +4,7 @@
   define="widget_name string:${view/name}.option">
 
   <table>
-    <tr>
+    <tr tal:condition="view/showUnassignOption">
       <td style="padding: 0 2px 2px 0">
         <input type="radio"
                tal:attributes="name widget_name;
@@ -56,7 +56,7 @@
         </tr>
       </tal:assigned_to_another_user>
     </tal:assigned>
-    <tr>
+    <tr tal:condition="view/showPersonChooserWidget">
       <td style="padding: 2px 2px 0 0;">
         <input type="radio"
                tal:attributes="name widget_name;

=== modified file 'lib/canonical/widgets/bugtask.py'
--- lib/canonical/widgets/bugtask.py	2009-07-29 03:29:24 +0000
+++ lib/canonical/widgets/bugtask.py	2010-06-04 09:33:28 +0000
@@ -224,6 +224,29 @@
             else:
                 return self.assigned_to
 
+    def showUnassignOption(self):
+        """Should the "unassign bugtask" option be shown?
+
+        To avoid user confusion, we show this option only if the user
+        can set the bug task assignee to None or if there is currently
+        no assignee set.
+        """
+        user = getUtility(ILaunchBag).user
+        context = self.context.context
+        return context.userCanUnassign(user) or context.assignee is None
+
+    def showPersonChooserWidget(self):
+        """Should the person chooser widget bw shown?
+
+        The person chooser is shown only if the user can assign at least
+        one other person or team in addition to himself.
+        """
+        user = getUtility(ILaunchBag).user
+        context = self.context.context
+        return user is not None and (
+            context.userCanSetAnyAssignee(user) or
+            user.teams_participated_in.count() > 0)
+
 
 class BugWatchEditForm(Interface):
     """Form field definition for the bug watch widget.

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-05-21 15:19:20 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-06-04 09:33:28 +0000
@@ -1177,6 +1177,14 @@
     return '_'.join(parts)
 
 
+def get_assignee_vocabulary(context):
+    """The vocabulary of bug task assignees the current user can set."""
+    if context.userCanSetAnyAssignee(getUtility(ILaunchBag).user):
+        return 'ValidAssignee'
+    else:
+        return 'AllUserTeamsParticipation'
+
+
 class BugTaskBugWatchMixin:
     """A mixin to be used where a BugTask view displays BugWatch data."""
 
@@ -1441,7 +1449,8 @@
             self.form_fields = self.form_fields.omit('assignee')
             self.form_fields += formlib.form.Fields(ParticipatingPersonChoice(
                 __name__='assignee', title=_('Assigned to'), required=False,
-                vocabulary='ValidAssignee', readonly=False))
+                vocabulary=get_assignee_vocabulary(self.context),
+                readonly=False))
             self.form_fields['assignee'].custom_widget = CustomWidgetFactory(
                 BugTaskAssigneeWidget)
 
@@ -3497,11 +3506,21 @@
 
     def js_config(self):
         """Configuration for the JS widgets on the row, JSON-serialized."""
+        assignee_vocabulary = get_assignee_vocabulary(self.context)
+        # Display the search field only if the user can set any person
+        # or team
+        user = getUtility(ILaunchBag).user
+        hide_assignee_team_selection = (
+            not self.context.userCanSetAnyAssignee(user) and
+            (user is None or user.teams_participated_in.count() == 0))
         return dumps({
             'row_id': 'tasksummary%s' % self.context.id,
             'bugtask_path': '/'.join(
                 [''] + canonical_url(self.context).split('/')[3:]),
             'prefix': get_prefix(self.context),
+            'assignee_vocabulary': assignee_vocabulary,
+            'hide_assignee_team_selection': hide_assignee_team_selection,
+            'user_can_unassign': self.context.userCanUnassign(user),
             'target_is_product': IProduct.providedBy(self.context.target),
             'status_widget_items': self.status_widget_items,
             'status_value': self.context.status.title,
@@ -3899,4 +3918,3 @@
     @property
     def text(self):
         return self.context.bug.displayname
-

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2010-04-15 13:26:33 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2010-06-04 09:33:28 +0000
@@ -297,10 +297,40 @@
             self.getWidgetOptionTitles(view.form_fields['status']))
 
 
+class TestBugTaskEditViewAssigneeField(TestCaseWithFactory):
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestBugTaskEditViewAssigneeField, self).setUp()
+        self.bugtask = self.factory.makeBug().default_bugtask
+
+    def test_assignee_field_vocabulary_regular_user(self):
+        # For regular users, the assignee vocabulary is
+        # AllUserTeamsParticipation.
+        login('[e-mail]')
+        view = BugTaskEditView(self.bugtask, LaunchpadTestRequest())
+        view.initialize()
+        self.assertEqual(
+            'AllUserTeamsParticipation',
+            view.form_fields['assignee'].field.vocabularyName)
+
+    def test_assignee_field_vocabulary_privileged_user(self):
+        # Privileged users, like the bug task target owner, can
+        # assign anybody.
+        login_person(self.bugtask.target.owner)
+        view = BugTaskEditView(self.bugtask, LaunchpadTestRequest())
+        view.initialize()
+        self.assertEqual(
+            'ValidAssignee',
+            view.form_fields['assignee'].field.vocabularyName)
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestBugTasksAndNominationsView))
     suite.addTest(unittest.makeSuite(TestBugTaskEditViewStatusField))
+    suite.addTest(unittest.makeSuite(TestBugTaskEditViewAssigneeField))
     suite.addTest(DocTestSuite(bugtask))
     suite.addTest(LayeredDocFileSuite(
         'bugtask-target-link-titles.txt', setUp=setUp, tearDown=tearDown,

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-05-26 15:24:23 +0000
+++ lib/lp/bugs/configure.zcml	2010-06-04 09:33:28 +0000
@@ -193,7 +193,9 @@
                     isSubscribed
                     getPackageComponent
                     userCanEditImportance
-                    userCanEditMilestone"/>
+                    userCanEditMilestone
+                    userCanSetAnyAssignee
+                    userCanUnassign"/>
             <require
                 permission="launchpad.View"
                 attributes="

=== modified file 'lib/lp/bugs/doc/bugtask.txt'
--- lib/lp/bugs/doc/bugtask.txt	2010-04-01 03:46:44 +0000
+++ lib/lp/bugs/doc/bugtask.txt	2010-06-04 09:33:28 +0000
@@ -564,6 +564,80 @@
     ...     devel_focus_alsa_utils_task.date_assigned)
     True
 
+Ordinary users can assign themselves and teams they are a member of.
+
+    >>> login('[e-mail]')
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(None)
+    Traceback (most recent call last):
+    ...
+    UserCannotEditBugTaskAssignee: Regular users can assign and unassign
+    only themselves and their teams. Only project onwers, bug supervisors,
+    drivers and release managers can assign others.
+
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(sample_person)
+    >>> print generic_alsa_utils_task.assignee.displayname
+    Sample Person
+    >>> login('[e-mail]')
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(no_priv)
+    >>> print devel_focus_alsa_utils_task.assignee.displayname
+    No Privileges Person
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(None)
+    >>> print generic_alsa_utils_task.assignee
+    None
+
+    >>> warty_security_team = getUtility(IPersonSet).getByName('name20')
+    >>> no_priv.inTeam(warty_security_team)
+    False
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(warty_security_team)
+    Traceback (most recent call last):
+    ...
+    UserCannotEditBugTaskAssignee: Regular users can assign and unassign
+    only themselves and their teams. Only project onwers, bug supervisors,
+    drivers and release managers can assign others.
+
+    >>> login('[e-mail]')
+    >>> sample_person.inTeam(warty_security_team)
+    True
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(warty_security_team)
+    >>> print devel_focus_alsa_utils_task.assignee.displayname
+    Warty Security Team
+
+These persons can assign anybody: Project owners...
+
+    >>> from lp.testing import login_person
+    >>> login_person(devel_focus_alsa_utils_task.pillar.owner)
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(no_priv)
+    >>> print generic_alsa_utils_task.assignee.displayname
+    No Privileges Person
+
+...drivers...
+
+    >>> devel_focus_alsa_utils_task.pillar.driver = sample_person
+    >>> login('[e-mail]')
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(None)
+    >>> print devel_focus_alsa_utils_task.assignee
+    None
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(mark)
+    >>> print devel_focus_alsa_utils_task.assignee.displayname
+    Mark Shuttleworth
+
+...bug supervisors...
+
+    >>> login_person(devel_focus_alsa_utils_task.pillar.owner)
+    >>> devel_focus_alsa_utils_task.pillar.setBugSupervisor(
+    ...     sample_person, devel_focus_alsa_utils_task.pillar.owner)
+    >>> devel_focus_alsa_utils_task.pillar.driver = None
+    >>> login('[e-mail]')
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(no_priv)
+    >>> print devel_focus_alsa_utils_task.assignee.displayname
+    No Privileges Person
+
+ ...and Launchpad admins.
+
+    >>> login('[e-mail]')
+    >>> devel_focus_alsa_utils_task.transitionToAssignee(sample_person)
+
+
 3. Importance
 
     >>> print generic_netapplet_task.importance.title

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-05-18 17:50:25 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-06-04 09:33:28 +0000
@@ -39,6 +39,7 @@
     'IUpstreamProductBugTaskSearch',
     'RESOLVED_BUGTASK_STATUSES',
     'UNRESOLVED_BUGTASK_STATUSES',
+    'UserCannotEditBugTaskAssignee',
     'UserCannotEditBugTaskImportance',
     'UserCannotEditBugTaskMilestone',
     'UserCannotEditBugTaskStatus',
@@ -365,6 +366,15 @@
     webservice_error(401) # HTTP Error: 'Unauthorised'
 
 
+class UserCannotEditBugTaskAssignee(Unauthorized):
+    """User not permitted to change bugtask assignees.
+
+    Raised when a user with insufficient prilieges tries to set
+    the assignee of a bug task.
+    """
+    webservice_error(401) # HTTP Error: 'Unauthorised'
+
+
 class IllegalTarget(Exception):
     """Exception raised when trying to set an illegal bug task target."""
     webservice_error(400) #Bad request.
@@ -661,6 +671,21 @@
         See `canTransitionToStatus` for more details.
         """
 
+    def userCanSetAnyAssignee(user):
+        """Check if the current user can set anybody sa a bugtask assignee.
+
+        Return True for project owner, project drivers, series drivers,
+        bug supervisors and Launchpad admins; return False for other users.
+        """
+
+    def userCanUnassign(user):
+        """Check if the current user can set assignee to None.
+
+        Project owner, project drivers, series drivers, bug supervisors
+        and Launchpad admins can do this always; other users can do this
+        only if they or their reams are the assignee.
+        """
+
     @mutator_for(assignee)
     @operation_parameters(
         assignee=copy_field(assignee))

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-04-17 11:58:39 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-06-04 09:33:28 +0000
@@ -51,6 +51,7 @@
 from canonical.database.enumcol import EnumCol
 
 from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.launchpad.webapp.interfaces import ILaunchBag
 
 from lp.registry.model.pillar import pillar_sort_key
 from canonical.launchpad.helpers import shortlist
@@ -64,8 +65,8 @@
     IDistroBugTask, IDistroSeriesBugTask, INullBugTask, IProductSeriesBugTask,
     IUpstreamBugTask, IllegalRelatedBugTasksParams, IllegalTarget,
     RESOLVED_BUGTASK_STATUSES, UNRESOLVED_BUGTASK_STATUSES,
-    UserCannotEditBugTaskImportance, UserCannotEditBugTaskMilestone,
-    UserCannotEditBugTaskStatus)
+    UserCannotEditBugTaskAssignee, UserCannotEditBugTaskImportance,
+    UserCannotEditBugTaskMilestone, UserCannotEditBugTaskStatus)
 from lp.bugs.model.bugsubscription import BugSubscription
 from lp.registry.interfaces.distribution import (
     IDistribution, IDistributionSet)
@@ -945,12 +946,54 @@
         if new_status < BugTaskStatus.FIXRELEASED:
             self.date_fix_released = None
 
+    def userCanSetAnyAssignee(self, user):
+        """See `IBugTask`."""
+        celebrities = getUtility(ILaunchpadCelebrities)
+        return user is not None and (
+            user.inTeam(self.pillar.bug_supervisor) or
+            user.inTeam(self.pillar.owner) or
+            user.inTeam(self.pillar.driver) or
+            (self.distroseries is not None and
+             user.inTeam(self.distroseries.driver)) or
+            (self.productseries is not None and
+             user.inTeam(self.productseries.driver)) or
+            user.inTeam(celebrities.admin)
+            or user == celebrities.bug_importer)
+
+    def userCanUnassign(self, user):
+        """True if user can set the assignee to None.
+
+        This option not shown for regular users unless they or their teams
+        are the assignees. Project owners, drivers, bug supervisors and
+        Launchpad admins can always unassign.
+        """
+        return user is not None and (
+            user.inTeam(self.assignee) or self.userCanSetAnyAssignee(user))
+
+    def canTransitionToAssignee(self, assignee):
+        """See `IBugTask`."""
+        # All users can assign and unassign themselves and their teams,
+        # but only project owners, bug supervisors, project/distribution
+        # drivers and Launchpad admins can assign others.
+        user = getUtility(ILaunchBag).user
+        return (
+            user is not None and (
+                user.inTeam(assignee) or
+                (assignee is None and self.userCanUnassign(user)) or
+                self.userCanSetAnyAssignee(user)))
+
     def transitionToAssignee(self, assignee):
         """See `IBugTask`."""
         if assignee == self.assignee:
             # No change to the assignee, so nothing to do.
             return
 
+        if not self.canTransitionToAssignee(assignee):
+            raise UserCannotEditBugTaskAssignee(
+                'Regular users can assign and unassign only themselves and '
+                'their teams. Only project onwers, bug supervisors, drivers '
+                'and release managers can assign others.')
+
         now = datetime.datetime.now(pytz.UTC)
         if self.assignee and not assignee:
             # The assignee is being cleared, so clear the date_assigned

=== modified file 'lib/lp/bugs/scripts/bugzilla.py'
--- lib/lp/bugs/scripts/bugzilla.py	2009-10-26 18:40:04 +0000
+++ lib/lp/bugs/scripts/bugzilla.py	2010-06-04 09:33:28 +0000
@@ -36,7 +36,8 @@
 from canonical.launchpad.interfaces.message import IMessageSet
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.bugs.interfaces.bug import CreateBugParams, IBugSet
-from lp.bugs.interfaces.bugattachment import BugAttachmentType, IBugAttachmentSet
+from lp.bugs.interfaces.bugattachment import (
+    BugAttachmentType, IBugAttachmentSet)
 from lp.bugs.interfaces.bugtask import (
     BugTaskImportance, BugTaskStatus, IBugTaskSet)
 from lp.bugs.interfaces.bugwatch import IBugWatchSet
@@ -213,26 +214,30 @@
     @property
     def ccs(self):
         """Return the IDs of people CC'd to this bug"""
-        if self._ccs is not None: return self._ccs
+        if self._ccs is not None:
+            return self._ccs
         self._ccs = self.backend.getBugCcs(self.bug_id)
         return self._ccs
 
     @property
     def comments(self):
         """Return the comments attached to this bug"""
-        if self._comments is not None: return self._comments
+        if self._comments is not None:
+            return self._comments
         self._comments = self.backend.getBugComments(self.bug_id)
         return self._comments
 
     @property
     def attachments(self):
         """Return the attachments for this bug"""
-        if self._attachments is not None: return self._attachments
+        if self._attachments is not None:
+            return self._attachments
         self._attachments = self.backend.getBugAttachments(self.bug_id)
         return self._attachments
 
     def mapSeverity(self, bugtask):
-        """Set a Launchpad bug task's importance based on this bug's severity."""
+        """Set a Launchpad bug task's importance based on this bug's severity.
+        """
         bug_importer = getUtility(ILaunchpadCelebrities).bug_importer
         importance_map = {
             'blocker': BugTaskImportance.CRITICAL,
@@ -289,8 +294,8 @@
         bugzilla_status += ', component=%s' % self.component
 
         if bugtask.statusexplanation:
-            bugtask.statusexplanation = '%s (%s)' % (bugtask.statusexplanation,
-                                                     bugzilla_status)
+            bugtask.statusexplanation = '%s (%s)' % (
+                bugtask.statusexplanation, bugzilla_status)
         else:
             bugtask.statusexplanation = bugzilla_status
 

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt	2010-06-04 09:33:28 +0000
@@ -79,13 +79,96 @@
     >>> user_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
     >>> assignee_control = user_browser.getControl(
     ...     name="jokosher.assignee.option", index=0)
-    >>> assignee_control.value = ["jokosher.assignee.assign_to"]
-    >>> assign_to_control = user_browser.getControl(
-    ...     name="jokosher.assignee", index=0)
-    >>> assign_to_control.value = "no-priv"
+    >>> assignee_control.value = ["jokosher.assignee.assign_to_me"]
     >>> user_browser.getControl("Save Changes", index=0).click()
     >>> print user_browser.url
     http://bugs.launchpad.dev/jokosher/+bug/11
     >>> print first_tag_by_class(
     ...     user_browser.contents, 'warning message')
     None
+
+
+== Bug task assignment by regular users ==
+
+Regular users can only set themselves and their teams as assignees.
+To avoid any confusion, the option to assign somebody else is only
+shown if the user has sufficient privileges to assign anybody or if
+the user is a member of at least one team. no-priv is no a member of
+any team and hence does no see the option to asign somebody else.
+
+    >>> no_priv.teams_participated_in.count()
+    0
+    >>> user_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
+    >>> assignee_control = user_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to"]
+    Traceback (most recent call last):
+    ...
+    ItemNotFoundError: insufficient items with name
+    'jokosher.assignee.assign_to'
+    >>> user_browser.getControl(name="jokosher.assignee", index=0)
+    Traceback (most recent call last):
+    ...
+    LookupError: name 'jokosher.assignee'
+
+Once no_priv is a member of a team, the option is shown.
+
+    >>> login('[e-mail]')
+    >>> no_privs_team_name = factory.makeTeam(owner=no_priv).name
+    >>> logout()
+    >>> user_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
+    >>> assignee_control = user_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to"]
+    >>> assign_to_control = user_browser.getControl(
+    ...     name="jokosher.assignee", index=0)
+    >>> assign_to_control.value = no_privs_team_name
+    >>> user_browser.getControl("Save Changes", index=0).click()
+    >>> print_errors(user_browser.contents)
+
+But if he treis to set other persons or teams, he gets an error message.
+
+    >>> user_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
+    >>> assignee_control = user_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to"]
+    >>> assign_to_control = user_browser.getControl(
+    ...     name="jokosher.assignee", index=0)
+    >>> assign_to_control.value = "name12"
+    >>> user_browser.getControl("Save Changes", index=0).click()
+    >>> print_errors(user_browser.contents)
+    There is 1 error in the data you entered. Please fix it and try again.
+    (Find&hellip;)
+    Constraint not satisfied
+
+The unassign option is only shown if the current assignee is the user
+or one of his teams...
+
+    >>> user_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
+    >>> assignee_control = user_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to_nobody"]
+    >>> user_browser.getControl("Save Changes", index=0).click()
+
+...or if there is no assignee.
+
+    >>> assignee_control = user_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to_nobody"]
+
+If the bugtask is assigned to anybody else, the unassign option is not
+shown.
+
+    >>> admin_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
+    >>> assignee_control = admin_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to_me"]
+    >>> admin_browser.getControl("Save Changes", index=0).click()
+    >>> user_browser.open("http://bugs.launchpad.dev/jokosher/+bug/11")
+    >>> assignee_control = user_browser.getControl(
+    ...     name="jokosher.assignee.option", index=0)
+    >>> assignee_control.value = ["jokosher.assignee.assign_to_nobody"]
+    Traceback (most recent call last):
+    ...
+    ItemNotFoundError: insufficient items with name
+    'jokosher.assignee.assign_to_nobody'

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2010-04-22 18:53:09 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2010-06-04 09:33:28 +0000
@@ -1643,13 +1643,14 @@
     >>> login('[e-mail]')
 
     >>> submit_commands(
-    ...     bug_one, 'status confirmed', 'assignee [e-mail]')
+    ...     bug_one, 'status confirmed',
+    ...     'assignee [e-mail]')
     >>> for bugtask in bug_one.bugtasks:
     ...     print '%s: %s, assigned to %s' % (
     ...         bugtask.bugtargetdisplayname, bugtask.status.title,
     ...         getattr(bugtask.assignee, 'displayname', 'no one'))
     Mozilla Firefox: Confirmed, assigned to Sample Person
-    mozilla-firefox (Ubuntu): Confirmed, assigned to No Privileges Person
+    mozilla-firefox (Ubuntu): Confirmed, assigned to Helge Kreutzmann
     mozilla-firefox (Debian): Confirmed, assigned to no one
 
     >>> pending_notifications = BugNotification.select(orderBy='-id', limit=2)
@@ -1658,7 +1659,7 @@
     ...     print bug_notification.message.text_contents
     1
     ** Changed in: mozilla-firefox (Ubuntu)
-         Assignee: (unassigned) => No Privileges Person (no-priv)
+         Assignee: (unassigned) => Helge Kreutzmann (kreutzm)
     1
     ** Changed in: mozilla-firefox (Ubuntu)
            Status: New => Confirmed
@@ -1687,7 +1688,7 @@
     ...     print bug_notification.message.text_contents
     1
     ** Changed in: mozilla-firefox (Ubuntu)
-         Assignee: No Privileges Person (no-priv) => Sample Person (name12)
+         Assignee: Helge Kreutzmann (kreutzm) => Sample Person (name12)
     1
     ** Changed in: mozilla-firefox (Ubuntu)
            Status: Confirmed => New
@@ -2036,16 +2037,16 @@
     None
 
 We send another email, creating a new task (for the package in ubuntu)
-and assigning the bug to `warty-gnome`.
+and assigning the bug to `landscape-developers`.
 
     >>> submit_commands(ff_bug,
-    ...     'affects ubuntu/mozilla-firefox', 'assignee warty-gnome')
+    ...     'affects ubuntu/mozilla-firefox', 'assignee landscape-developers')
 
 The email was handled correctly - A new bugtask was added and assigned
 to the specified team.
 
     >>> print ff_bug.bugtasks[-1].assignee.name
-    warty-gnome
+    landscape-developers
 
 
 == Recovering from errors ==

=== modified file 'lib/lp/bugs/tests/test_bugtask.py'
--- lib/lp/bugs/tests/test_bugtask.py	2010-02-02 17:12:29 +0000
+++ lib/lp/bugs/tests/test_bugtask.py	2010-06-04 09:33:28 +0000
@@ -11,8 +11,8 @@
 
 from lazr.lifecycle.snapshot import Snapshot
 
-from canonical.launchpad.ftests import login
 from lp.hardwaredb.interfaces.hwdb import HWBus, IHWDeviceSet
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.searchbuilder import all, any
 from canonical.testing import LaunchpadFunctionalLayer, LaunchpadZopelessLayer
 
@@ -20,7 +20,10 @@
     BugTaskImportance, BugTaskSearchParams, BugTaskStatus)
 from lp.bugs.model.bugtask import build_tag_search_clause
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.testing import TestCase, normalize_whitespace, TestCaseWithFactory
+from lp.registry.interfaces.person import IPersonSet
+from lp.testing import (
+    ANONYMOUS, TestCase, TestCaseWithFactory, login, login_person, logout,
+    normalize_whitespace)
 
 
 class TestBugTaskDelta(TestCaseWithFactory):
@@ -498,10 +501,231 @@
             [bugtask.bug.id for bugtask in bugtasks])
 
 
+class TestBugTaskPermissionsToSetAssigneeBase(TestCaseWithFactory):
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        """Crate the test setup.
+
+        We need
+        - bug task targets (a product and a product series, or
+          a distribution and distoseries, see classes derived from
+          this one)
+        - persons and team with special roles: product and distribution,
+          owners, bug supervisors, drivers
+        - bug tasks for the targets
+        """
+        super(TestBugTaskPermissionsToSetAssigneeBase, self).setUp()
+        self.target_owner_member = self.factory.makePerson()
+        self.target_owner_team = self.factory.makeTeam(
+            owner=self.target_owner_member)
+        self.regular_user = self.factory.makePerson()
+
+        login_person(self.target_owner_member)
+        self.makeTarget()
+
+        self.supervisor_team = self.factory.makeTeam(
+            owner=self.target_owner_member)
+        self.supervisor_member = self.factory.makePerson()
+        self.supervisor_team.addMember(
+            self.supervisor_member, self.target_owner_member)
+        self.target.setBugSupervisor(
+            self.supervisor_team, self.target_owner_member)
+
+        self.driver_team = self.factory.makeTeam(
+            owner=self.target_owner_member)
+        self.driver_member = self.factory.makePerson()
+        self.driver_team.addMember(
+            self.driver_member, self.target_owner_member)
+        self.target.driver = self.driver_team
+
+        self.series_driver_team = self.factory.makeTeam(
+            owner=self.target_owner_member)
+        self.series_driver_member = self.factory.makePerson()
+        self.series_driver_team.addMember(
+            self.series_driver_member, self.target_owner_member)
+        self.series.driver = self.series_driver_team
+
+        self.series_bugtask = self.factory.makeBugTask(target=self.series)
+        self.series_bugtask.transitionToAssignee(self.regular_user)
+        bug = self.series_bugtask.bug
+        # If factory.makeBugTask() is called with a series target, it
+        # creates automatically another bug task for the main target.
+        self.target_bugtask = bug.getBugTask(self.target)
+        self.target_bugtask.transitionToAssignee(self.regular_user)
+        logout()
+
+    def test_userCanSetAnyAssignee_anonymous_user(self):
+        # Anonymous users cannot set anybody as an assignee.
+        login(ANONYMOUS)
+        self.assertFalse(self.target_bugtask.userCanSetAnyAssignee(None))
+        self.assertFalse(self.series_bugtask.userCanSetAnyAssignee(None))
+
+    def test_userCanUnassign_anonymous_user(self):
+        # Anonymous users cannot unassign anyone.
+        login(ANONYMOUS)
+        self.assertFalse(self.target_bugtask.userCanUnassign(None))
+        self.assertFalse(self.series_bugtask.userCanUnassign(None))
+
+    def test_userCanSetAnyAssignee_regular_user(self):
+        # Ordinary users cannot set others as an assignee.
+        login_person(self.regular_user)
+        self.assertFalse(
+            self.target_bugtask.userCanSetAnyAssignee(self.regular_user))
+        self.assertFalse(
+            self.series_bugtask.userCanSetAnyAssignee(self.regular_user))
+
+    def test_userCanUnassign_regular_user(self):
+        # Ordinary users can unassign themselves...
+        login_person(self.regular_user)
+        self.assertEqual(self.target_bugtask.assignee, self.regular_user)
+        self.assertEqual(self.series_bugtask.assignee, self.regular_user)
+        self.assertTrue(
+            self.target_bugtask.userCanUnassign(self.regular_user))
+        self.assertTrue(
+            self.series_bugtask.userCanUnassign(self.regular_user))
+        # ...but not other assignees.
+        login_person(self.target_owner_member)
+        other_user = self.factory.makePerson()
+        self.series_bugtask.transitionToAssignee(other_user)
+        self.target_bugtask.transitionToAssignee(other_user)
+        login_person(self.regular_user)
+        self.assertFalse(
+            self.target_bugtask.userCanUnassign(self.regular_user))
+        self.assertFalse(
+            self.series_bugtask.userCanUnassign(self.regular_user))
+
+    def test_userCanSetAnyAssignee_target_owner(self):
+        # The bug task target owner can assign anybody.
+        login_person(self.target_owner_member)
+        self.assertTrue(
+            self.target_bugtask.userCanSetAnyAssignee(self.target.owner))
+        self.assertTrue(
+            self.series_bugtask.userCanSetAnyAssignee(self.target.owner))
+
+    def test_userCanUnassign_target_owner(self):
+        # The target owner can unassign anybody.
+        login_person(self.target_owner_member)
+        self.assertTrue(
+            self.target_bugtask.userCanUnassign(self.target_owner_member))
+        self.assertTrue(
+            self.series_bugtask.userCanUnassign(self.target_owner_member))
+
+    def test_userCanSetAnyAssignee_bug_supervisor(self):
+        # A bug supervisor can assign anybody.
+        login_person(self.supervisor_member)
+        self.assertTrue(
+            self.target_bugtask.userCanSetAnyAssignee(self.supervisor_member))
+        self.assertTrue(
+            self.series_bugtask.userCanSetAnyAssignee(self.supervisor_member))
+
+    def test_userCanUnassign_bug_supervisor(self):
+        # A bug supervisor can unassign anybody.
+        login_person(self.supervisor_member)
+        self.assertTrue(
+            self.target_bugtask.userCanUnassign(self.supervisor_member))
+        self.assertTrue(
+            self.series_bugtask.userCanUnassign(self.supervisor_member))
+
+    def test_userCanSetAnyAssignee_driver(self):
+        # A project driver can assign anybody.
+        login_person(self.driver_member)
+        self.assertTrue(
+            self.target_bugtask.userCanSetAnyAssignee(self.driver_member))
+        self.assertTrue(
+            self.series_bugtask.userCanSetAnyAssignee(self.driver_member))
+
+    def test_userCanUnassign_driver(self):
+        # A project driver can unassign anybody.
+        login_person(self.driver_member)
+        self.assertTrue(
+            self.target_bugtask.userCanUnassign(self.driver_member))
+        self.assertTrue(
+            self.series_bugtask.userCanUnassign(self.driver_member))
+
+    def test_userCanSetAnyAssignee_series_driver(self):
+        # A series driver can assign anybody to series bug tasks.
+        login_person(self.driver_member)
+        self.assertTrue(
+            self.series_bugtask.userCanSetAnyAssignee(
+                self.series_driver_member))
+        # But he cannot assign anybody to bug tasks of the main target.
+        self.assertFalse(
+            self.target_bugtask.userCanSetAnyAssignee(
+                self.series_driver_member))
+
+    def test_userCanUnassign_series_driver(self):
+        # The target owner can unassign anybody from series bug tasks...
+        login_person(self.series_driver_member)
+        self.assertTrue(
+            self.series_bugtask.userCanUnassign(self.series_driver_member))
+        # ...but not from tasks of the main product/distribution.
+        self.assertFalse(
+            self.target_bugtask.userCanUnassign(self.series_driver_member))
+
+    def test_userCanSetAnyAssignee_launchpad_admins(self):
+        # Launchpad admins can assign anybody.
+        login_person(self.target_owner_member)
+        foo_bar = getUtility(IPersonSet).getByEmail('[e-mail]')
+        login_person(foo_bar)
+        self.assertTrue(self.target_bugtask.userCanSetAnyAssignee(foo_bar))
+        self.assertTrue(self.series_bugtask.userCanSetAnyAssignee(foo_bar))
+
+    def test_userCanUnassign_launchpad_admins(self):
+        # Launchpad admins can unassign anybody.
+        login_person(self.target_owner_member)
+        foo_bar = getUtility(IPersonSet).getByEmail('[e-mail]')
+        login_person(foo_bar)
+        self.assertTrue(self.target_bugtask.userCanUnassign(foo_bar))
+        self.assertTrue(self.series_bugtask.userCanUnassign(foo_bar))
+
+    def test_userCanSetAnyAssignee_bug_importer(self):
+        # The bug importer celebrity can assign anybody.
+        login_person(self.target_owner_member)
+        bug_importer = getUtility(ILaunchpadCelebrities).bug_importer
+        login_person(bug_importer)
+        self.assertTrue(
+            self.target_bugtask.userCanSetAnyAssignee(bug_importer))
+        self.assertTrue(
+            self.series_bugtask.userCanSetAnyAssignee(bug_importer))
+
+    def test_userCanUnassign_launchpad_bug_importer(self):
+        # The bug importer celebrity can unassign anybody.
+        login_person(self.target_owner_member)
+        bug_importer = getUtility(ILaunchpadCelebrities).bug_importer
+        login_person(bug_importer)
+        self.assertTrue(self.target_bugtask.userCanUnassign(bug_importer))
+        self.assertTrue(self.series_bugtask.userCanUnassign(bug_importer))
+
+
+class TestProductBugTaskPermissionsToSetAssignee(
+    TestBugTaskPermissionsToSetAssigneeBase):
+
+    def makeTarget(self):
+        """Create a product and a product series."""
+        self.target = self.factory.makeProduct(owner=self.target_owner_team)
+        self.series = self.factory.makeProductSeries(self.target)
+
+
+class TestDistributionBugTaskPermissionsToSetAssignee(
+    TestBugTaskPermissionsToSetAssigneeBase):
+
+    def makeTarget(self):
+        """Create a distribution and a distroseries."""
+        self.target = self.factory.makeDistribution(
+            owner=self.target_owner_team)
+        self.series = self.factory.makeDistroSeries(self.target)
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestBugTaskDelta))
     suite.addTest(unittest.makeSuite(TestBugTaskTagSearchClauses))
     suite.addTest(unittest.makeSuite(TestBugTaskHardwareSearch))
+    suite.addTest(unittest.makeSuite(
+        TestProductBugTaskPermissionsToSetAssignee))
+    suite.addTest(unittest.makeSuite(
+        TestDistributionBugTaskPermissionsToSetAssignee))
     suite.addTest(DocTestSuite('lp.bugs.model.bugtask'))
     return suite

=== modified file 'lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt'
--- lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt	2009-05-12 08:11:06 +0000
+++ lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt	2010-06-04 09:33:28 +0000
@@ -49,7 +49,9 @@
 
 Only a change in status triggers a notification.
 
+    >>> from lp.testing import login_person
     >>> sample_person = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> login_person(sample_person)
     >>> original_bugtask = Snapshot(bugtask, providing=providedBy(bugtask))
     >>> bugtask.transitionToAssignee(sample_person)
     >>> notify(ObjectModifiedEvent(

=== modified file 'lib/lp/registry/tests/test_user_vocabularies.py'
--- lib/lp/registry/tests/test_user_vocabularies.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/tests/test_user_vocabularies.py	2010-06-04 09:33:28 +0000
@@ -7,12 +7,16 @@
 
 from unittest import TestLoader
 
+from zope.component import getUtility
 from zope.schema.vocabulary import getVocabularyRegistry
 
+from canonical.launchpad.ftests import ANONYMOUS, login, login_person
+from canonical.launchpad.webapp.interfaces import (
+        IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
+from canonical.testing import LaunchpadFunctionalLayer
+from lp.registry.model.person import Person
 from lp.registry.interfaces.person import PersonVisibility
-from canonical.launchpad.ftests import login, login_person
 from lp.testing import TestCaseWithFactory
-from canonical.testing import LaunchpadFunctionalLayer
 
 
 class TestUserTeamsParticipationPlusSelfVocabulary(TestCaseWithFactory):
@@ -72,5 +76,68 @@
         self.assertEqual([user, alpha, bravo], self._vocabTermValues())
 
 
+class TestAllUserTeamsParticipationVocabulary(TestCaseWithFactory):
+    """AllUserTeamsParticipation contains all teams joined by a user.
+
+    This includes private teams.
+    """
+
+    layer = LaunchpadFunctionalLayer
+
+    def _vocabTermValues(self):
+        """Return the token values for the vocab."""
+        # XXX Abel Deuring 2010-05-21, bug 583502: We cannot simply iterate
+        # over the items of AllUserTeamsPariticipationVocabulary as in
+        # class TestUserTeamsParticipationPlusSelfVocabulary.
+        # So we iterate over all Person records and return all terms
+        # returned by vocabulary.searchForTerms(person.name)
+        vocabulary_registry = getVocabularyRegistry()
+        vocab = vocabulary_registry.get(None, 'AllUserTeamsParticipation')
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        result = []
+        for person in store.find(Person):
+            result.extend(
+                term.value for term in vocab.searchForTerms(person.name))
+        return result
+
+    def test_user_no_team(self):
+        user = self.factory.makePerson()
+        login_person(user)
+        self.assertEqual([], self._vocabTermValues())
+
+    def test_user_is_team_owner(self):
+        user = self.factory.makePerson()
+        login_person(user)
+        team = self.factory.makeTeam(owner=user)
+        self.assertEqual([team], self._vocabTermValues())
+
+    def test_user_in_two_teams(self):
+        user = self.factory.makePerson()
+        login_person(user)
+        team1 = self.factory.makeTeam()
+        user.join(team1)
+        team2 = self.factory.makeTeam()
+        user.join(team2)
+        self.assertEqual(set([team1, team2]), set(self._vocabTermValues()))
+
+    def test_user_in_private_teams(self):
+        # Private teams are included in the vocabulary.
+        user = self.factory.makePerson()
+        team_owner = self.factory.makePerson()
+        login_person(team_owner)
+        team = self.factory.makeTeam(owner=team_owner)
+        team.addMember(person=user, reviewer=team_owner)
+        # Launchpad admin rights are needed to set private membership.
+        login('[e-mail]')
+        team.visibility = PersonVisibility.PRIVATE
+        login_person(user)
+        self.assertEqual([team], self._vocabTermValues())
+
+    def test_teams_of_anonymous(self):
+        # AllUserTeamsPariticipationVocabulary is empty for anoymous users.
+        login(ANONYMOUS)
+        self.assertEqual([], self._vocabTermValues())
+
+
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/registry/vocabularies.py'
--- lib/lp/registry/vocabularies.py	2010-05-27 01:46:06 +0000
+++ lib/lp/registry/vocabularies.py	2010-06-04 09:33:28 +0000
@@ -26,6 +26,7 @@
 __all__ = [
     'ActiveMailingListVocabulary',
     'AdminMergeablePersonVocabulary',
+    'AllUserTeamsParticipationVocabulary',
     'CommercialProjectsVocabulary',
     'DistributionOrProductOrProjectGroupVocabulary',
     'DistributionOrProductVocabulary',
@@ -757,6 +758,27 @@
         ValidPersonOrTeamVocabulary.__init__(self, context)
 
 
+class AllUserTeamsParticipationVocabulary(ValidTeamVocabulary):
+    """The set of teams where the current user is a member.
+
+    Other than UserTeamsParticipationVocabulary, this vocabulary includes
+    private teams.
+    """
+
+    displayname = 'Select a Team of which you are a member'
+
+    def __init__(self, context):
+        super(AllUserTeamsParticipationVocabulary, self).__init__(context)
+        user = getUtility(ILaunchBag).user
+        if user is None:
+            self.extra_clause = False
+        else:
+            self.extra_clause = AND(
+                super(AllUserTeamsParticipationVocabulary, self).extra_clause,
+                TeamParticipation.person == user.id,
+                TeamParticipation.team == Person.id)
+
+
 class PersonActiveMembershipVocabulary:
     """All the teams the person is an active member of."""
 

=== modified file 'lib/lp/registry/vocabularies.zcml'
--- lib/lp/registry/vocabularies.zcml	2010-04-19 08:11:52 +0000
+++ lib/lp/registry/vocabularies.zcml	2010-06-04 09:33:28 +0000
@@ -256,6 +256,19 @@
 
 
   <securedutility
+    name="AllUserTeamsParticipation"
+    component="lp.registry.vocabularies.AllUserTeamsParticipationVocabulary"
+    provides="zope.schema.interfaces.IVocabularyFactory"
+    >
+    <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
+  </securedutility>
+
+  <class class="lp.registry.vocabularies.AllUserTeamsParticipationVocabulary">
+    <allow interface="canonical.launchpad.webapp.vocabulary.IHugeVocabulary"/>
+  </class>
+
+
+  <securedutility
     name="ActiveMailingList"
     component="lp.registry.vocabularies.ActiveMailingListVocabulary"
     provides="zope.schema.interfaces.IVocabularyFactory"

=== removed file 'scripts/sourceforge-import.py'
--- scripts/sourceforge-import.py	2010-04-22 17:30:35 +0000
+++ scripts/sourceforge-import.py	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-#!/usr/bin/python2.5 -S
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=W0403
-import _pythonpath
-
-import logging
-import optparse
-import sys
-
-from zope.component import getUtility
-from canonical.config import config
-from canonical.lp import initZopeless
-from canonical.launchpad.interfaces import IProductSet
-from canonical.launchpad.scripts import (
-    execute_zcml_for_scripts, logger_options, logger)
-from canonical.launchpad.webapp.interaction import setupInteractionByEmail
-
-from canonical.launchpad.scripts.sftracker import Tracker, TrackerImporter
-
-def main(argv):
-    parser = optparse.OptionParser(description="This script imports bugs "
-                                   "from Sourceforge into Launchpad.")
-
-    parser.add_option('--product', metavar='PRODUCT', action='store',
-                      help='The product to associate bugs with',
-                      type='string', dest='product', default=None)
-    parser.add_option('--dumpfile', metavar='XML', action='store',
-                      help='The XML tracker data dump',
-                      type='string', dest='dumpfile', default=None)
-    parser.add_option('--dumpdir', metavar='DIR', action='store',
-                      help='The directory with the dumped tracker data',
-                      type='string', dest='dumpdir', default=None)
-    parser.add_option('--verify-users', dest='verify_users',
-                      help='Should created users have verified emails?',
-                      action='store_true', default=False)
-
-    logger_options(parser, logging.INFO)
-
-    options, args = parser.parse_args(argv[1:])
-    logger(options, 'canonical.launchpad.scripts.sftracker')
-
-    # don't send email
-    send_email_data = """
-        [zopeless]
-        send_email: False
-        """
-    config.push('send_email_data', send_email_data)
-
-    execute_zcml_for_scripts()
-    ztm = initZopeless()
-    setupInteractionByEmail('[e-mail]')
-
-    product = getUtility(IProductSet).getByName(options.product)
-    tracker = Tracker(options.dumpfile, options.dumpdir)
-    importer = TrackerImporter(product, options.verify_users)
-
-    importer.importTracker(ztm, tracker)
-    config.pop('send_email_data')
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))