Merge lp:~stevenk/launchpad/no-structsub-for-bug-supervisor into lp:launchpad

[Steve Kowalik]

No longer give bug supervisors an unconditional structural subscription on the target when they are set.

No longer give bug supervisors an unconditional structural subscription on the target when they are set. Due to this, bug supervisor no longer has to have such a draconian validation method, since setting it will no longer spam them with tonnes of mail.

I have done a bunch of drive-bys in this branch too. Mostly whitespace related.

[William Grant (wgrant)]

Thanks for this cleanup. I wonder if you could go even further by porting some bug_supervisor setters to use makeProduct(bug_supervisor=) instead, as a few seem to be ignorant of its existence.

610 Let's make Foo Bar a bug supervisor for upstream firefox:
611
612 - >>> mozilla_firefox.setBugSupervisor(foobar, foobar)
613 + >>> mozilla_firefox.bug_supervisor = foobar

Is this bit necessary any more? The rest of the test looks like it was just testing notification.

1426 def testPersonCanSetSelfAsSupervisor(self):
1427 # A person can set themselves as bug supervisor for a product.
1428 # This is a regression test for bug 438985.

This test can probably die now.

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugrole.py'
--- lib/lp/bugs/browser/bugrole.py	2012-02-09 04:28:33 +0000
+++ lib/lp/bugs/browser/bugrole.py	2012-08-16 12:16:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version (see the file LICENSE).
 
 """Common classes to support bug roles."""
@@ -41,51 +41,6 @@
         else:
             return self.OTHER_USER
 
-    def validateBugSupervisor(self, data):
-        """Validates the new bug supervisor.
-
-        Verify that the value is None, the user, or a team he administers,
-        otherwise, set a field error.
-        """
-        field_state = self._getFieldState(
-            self.context.bug_supervisor, 'bug_supervisor', data)
-        if field_state is self.INVALID_PERSON:
-            error = (
-                'You must choose a valid person or team to be the '
-                'bug supervisor for %s.' % self.context.displayname)
-        elif field_state is self.OTHER_TEAM:
-            supervisor = data['bug_supervisor']
-            team_url = canonical_url(
-                supervisor, rootsite='mainsite', view_name='+members')
-            error = structured(
-                'You cannot set %(team)s as the bug supervisor for '
-                '%(target)s because you are not an administrator of that '
-                'team.<br />If you believe that %(team)s should be the '
-                'bug supervisor for %(target)s, notify one of the '
-                '<a href="%(url)s">%(team)s administrators</a>. See '
-                '<a href="https://help.launchpad.net/BugSupervisors">'
-                'the help wiki</a> for information about setting a bug '
-                'supervisor.',
-                team=supervisor.displayname,
-                target=self.context.displayname,
-                url=team_url)
-        elif field_state is self.OTHER_USER:
-            error = structured(
-                'You cannot set another person as the bug supervisor for '
-                '%(target)s.<br />See '
-                '<a href="https://help.launchpad.net/BugSupervisors">'
-                'the help wiki</a> for information about setting a bug '
-                'supervisor.',
-                target=self.context.displayname)
-        else:
-            # field_state is self.OK.
-            return
-        self.setFieldError('bug_supervisor', error)
-
-    def changeBugSupervisor(self, bug_supervisor):
-        if self.context.bug_supervisor != bug_supervisor:
-            self.context.setBugSupervisor(bug_supervisor, self.user)
-
     def changeSecurityContact(self, security_contact):
         if self.context.security_contact != security_contact:
             self.context.security_contact = security_contact

=== modified file 'lib/lp/bugs/browser/bugsupervisor.py'
--- lib/lp/bugs/browser/bugsupervisor.py	2012-02-28 04:24:19 +0000
+++ lib/lp/bugs/browser/bugsupervisor.py	2012-08-16 12:16:23 +0000
@@ -60,23 +60,14 @@
 
     cancel_url = next_url
 
-    def validate(self, data):
-        """See `LaunchpadFormView`."""
-        self.validateBugSupervisor(data)
-
     @action('Change', name='change')
     def change_action(self, action, data):
         """Redirect to the target page with a success message."""
-        bug_supervisor = data['bug_supervisor']
-        self.changeBugSupervisor(bug_supervisor)
-        if bug_supervisor is None:
+        self.updateContextFromData(data)
+        if self.context.bug_supervisor is None:
             message = (
                 "Successfully cleared the bug supervisor. "
                 "You can set the bug supervisor again at any time.")
         else:
-            message = structured(
-                'A bug mail subscription was created for the bug supervisor. '
-                'You can <a href="%s">edit bug mail</a> '
-                'to change which notifications will be sent.',
-                canonical_url(self.context, view_name='+subscriptions'))
+            message = structured('Bug supervisor privilege granted.')
         self.request.response.addNotification(message)

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2012-08-03 00:30:51 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2012-08-16 12:16:23 +0000
@@ -218,7 +218,6 @@
         """Constrain bug expiration to Launchpad Bugs tracker."""
         super(ProductConfigureBugTrackerView, self).validate(data)
         if check_permission("launchpad.Edit", self.context):
-            self.validateBugSupervisor(data)
             self.validateSecurityContact(data)
         # enable_bug_expiration is disabled by JavaScript when bugtracker
         # is not 'In Launchpad'. The constraint is enforced here in case the
@@ -231,12 +230,10 @@
 
     @action("Change", name='change')
     def change_action(self, action, data):
-        # bug_supervisor and security_contactrequires a transition method,
-        # so it must be handled separately and removed for the
-        # updateContextFromData to work as expected.
+        # security_contact requires a transition method, so it must be
+        # handled separately and removed for the updateContextFromData call
+        # to work as expected.
         if check_permission("launchpad.Edit", self.context):
-            self.changeBugSupervisor(data['bug_supervisor'])
-            del data['bug_supervisor']
             self.changeSecurityContact(data['security_contact'])
             del data['security_contact']
         self.updateContextFromData(data)

=== modified file 'lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt'
--- lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt	2012-08-06 03:47:42 +0000
+++ lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt	2012-08-16 12:16:23 +0000
@@ -685,7 +685,7 @@
     >>> ignored = login_person(owner)
     >>> filebug_view = create_initialized_view(product, '+filebug')
     >>> owner_fields = set(filebug_view.field_names)
-    >>> product.setBugSupervisor(owner, owner)
+    >>> product.bug_supervisor = owner
     >>> supervisor_fields = set(filebug_view.field_names)
 
 Privileged users get most of the same fields as normal users, plus a few

=== modified file 'lib/lp/bugs/browser/tests/bugtask-edit-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-edit-views.txt	2012-05-22 12:05:51 +0000
+++ lib/lp/bugs/browser/tests/bugtask-edit-views.txt	2012-08-16 12:16:23 +0000
@@ -248,7 +248,7 @@
     >>> login("[e-mail]")
     >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
     >>> no_priv = getUtility(IPersonSet).getByName("no-priv")
-    >>> ubuntu.setBugSupervisor(no_priv, no_priv)
+    >>> ubuntu.bug_supervisor = no_priv
 
 Unlike before, no-priv can now edit the milestone.
 

=== modified file 'lib/lp/bugs/browser/tests/test_bugnomination.py'
--- lib/lp/bugs/browser/tests/test_bugnomination.py	2012-08-08 11:48:29 +0000
+++ lib/lp/bugs/browser/tests/test_bugnomination.py	2012-08-16 12:16:23 +0000
@@ -41,7 +41,7 @@
         self.bug_worker = self.factory.makePerson()
         with person_logged_in(owner):
             bug_team.addMember(self.bug_worker, owner)
-            self.distribution.setBugSupervisor(bug_team, owner)
+            self.distribution.bug_supervisor = bug_team
             self.distribution.driver = self.factory.makePerson()
         self.bug_task = self.factory.makeBugTask(target=self.distribution)
         launchbag = getUtility(ILaunchBag)
@@ -54,7 +54,7 @@
         members.append(person)
         bug_supervisor = self.factory.makeTeam(members=members, owner=owner)
         with person_logged_in(owner):
-            target.setBugSupervisor(bug_supervisor, owner)
+            target.bug_supervisor = bug_supervisor
 
     def test_submit_action_bug_supervisor(self):
         # A bug supervisor sees the Nominate action label.

=== modified file 'lib/lp/bugs/browser/tests/test_bugsupervisor.py'
--- lib/lp/bugs/browser/tests/test_bugsupervisor.py	2012-08-14 23:27:07 +0000
+++ lib/lp/bugs/browser/tests/test_bugsupervisor.py	2012-08-16 12:16:23 +0000
@@ -1,11 +1,10 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version (see the file LICENSE).
 
 """Unit tests for bug supervisor views."""
 
 __metaclass__ = type
 
-from zope.app.form.interfaces import ConversionError
 from zope.component import getUtility
 
 from lp.bugs.browser.bugsupervisor import BugSupervisorEditSchema
@@ -14,7 +13,6 @@
 from lp.services.webapp.publisher import canonical_url
 from lp.testing import (
     BrowserTestCase,
-    login,
     login_person,
     TestCaseWithFactory,
     )
@@ -70,14 +68,11 @@
         self.assertEqual(self.product.bug_supervisor, self.owner)
         notifications = view.request.response.notifications
         self.assertEqual(1, len(notifications))
-        expected = (
-            'A bug mail subscription was created for the bug supervisor. '
-            'You can <a href="http://launchpad.dev/boing/+subscriptions">'
-            'edit bug mail</a> to change which notifications will be sent.')
+        expected = 'Bug supervisor privilege granted.'
         self.assertEqual(expected, notifications.pop().message)
 
     def test_owner_appoint_self_from_another(self):
-        self.product.setBugSupervisor(self.team, self.owner)
+        self.product.bug_supervisor = self.team
         form = self._makeForm(self.owner)
         view = create_initialized_view(
             self.product, name='+bugsupervisor', form=form)
@@ -85,7 +80,7 @@
         self.assertEqual(self.owner, self.product.bug_supervisor)
 
     def test_owner_appoint_none(self):
-        self.product.setBugSupervisor(self.owner, self.owner)
+        self.product.bug_supervisor = self.owner
         form = self._makeForm(None)
         view = create_initialized_view(
             self.product, name='+bugsupervisor', form=form)
@@ -115,77 +110,6 @@
         self.assertEqual([], view.errors)
         self.assertEqual(private_team, self.product.bug_supervisor)
 
-    def test_owner_cannot_appoint_another_team(self):
-        team = self.factory.makeTeam(name='smack', displayname='<smack />')
-        form = self._makeForm(team)
-        view = create_initialized_view(
-            self.product, name='+bugsupervisor', form=form)
-        self.assertEqual(1, len(view.errors))
-        expected = (
-            'You cannot set &lt;smack /&gt; as the bug supervisor for '
-            '&lt;boing /&gt; because you are not an administrator of that '
-            'team.<br />If you believe that &lt;smack /&gt; should be the '
-            'bug supervisor for &lt;boing /&gt;, notify one of the '
-            '<a href="http://launchpad.dev/~smack/+members">&lt;smack /&gt; '
-            'administrators</a>. See '
-            '<a href="https://help.launchpad.net/BugSupervisors">the '
-            'help wiki</a> for information about setting a bug supervisor.')
-        self.assertEqual(expected, view.errors.pop())
-
-    def test_owner_cannot_appoint_a_nonvalid_user(self):
-        # The vocabulary only accepts valid users.
-        form = self._makeForm(None)
-        form['field.bug_supervisor'] = 'fnord'
-        view = create_initialized_view(
-            self.product, name='+bugsupervisor', form=form)
-        self.assertEqual(2, len(view.errors))
-        expected = (
-            'You must choose a valid person or team to be the bug supervisor '
-            'for &lt;boing /&gt;.')
-        self.assertEqual(expected, view.errors.pop())
-        self.assertTrue(isinstance(view.errors.pop(), ConversionError))
-
-    def test_owner_cannot_appoint_another_user(self):
-        another_user = self.factory.makePerson()
-        form = self._makeForm(another_user)
-        view = create_initialized_view(
-            self.product, name='+bugsupervisor', form=form)
-        self.assertEqual(1, len(view.errors))
-        expected = (
-            'You cannot set another person as the bug supervisor for '
-            '&lt;boing /&gt;.<br />See '
-            '<a href="https://help.launchpad.net/BugSupervisors">the help '
-            'wiki</a> for information about setting a bug supervisor.')
-        self.assertEqual(expected, view.errors.pop())
-
-    def test_admin_appoint_another_user(self):
-        another_user = self.factory.makePerson()
-        login('[e-mail]')
-        form = self._makeForm(another_user)
-        view = create_initialized_view(
-            self.product, name='+bugsupervisor', form=form)
-        self.assertEqual([], view.errors)
-        self.assertEqual(another_user, self.product.bug_supervisor)
-
-    def test_admin_appoint_another_team(self):
-        another_team = self.factory.makeTeam()
-        login('[e-mail]')
-        form = self._makeForm(another_team)
-        view = create_initialized_view(
-            self.product, name='+bugsupervisor', form=form)
-        self.assertEqual([], view.errors)
-        self.assertEqual(another_team, self.product.bug_supervisor)
-
-    def test_admin_appoint_private_team(self):
-        private_team = self.factory.makeTeam(
-            visibility=PersonVisibility.PRIVATE)
-        login('[e-mail]')
-        form = self._makeForm(private_team)
-        view = create_initialized_view(
-            self.product, name='+bugsupervisor', form=form)
-        self.assertEqual([], view.errors)
-        self.assertEqual(private_team, self.product.bug_supervisor)
-
 
 class TestBugSupervisorLink(BrowserTestCase):
 

=== modified file 'lib/lp/bugs/browser/tests/test_bugtarget_configure.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_configure.py	2012-08-13 19:34:10 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_configure.py	2012-08-16 12:16:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version (see the file LICENSE).
 
 """Unit tests for bug configuration views."""
@@ -92,17 +92,6 @@
             self.product.bug_reported_acknowledgement)
         self.assertFalse(self.product.enable_bugfiling_duplicate_search)
 
-    def test_bug_supervisor_invalid(self):
-        # Verify that invalid bug_supervisor states are reported.
-        # This is a sanity check. The bug_supervisor is rigorously tested
-        # in its own test.
-        other_person = self.factory.makePerson()
-        form = self._makeForm()
-        form['field.bug_supervisor'] = other_person.name
-        view = create_initialized_view(
-            self.product, name='+configure-bugtracker', form=form)
-        self.assertEqual(1, len(view.errors))
-
     def test_security_contact_invalid(self):
         # Verify that invalid security_contact states are reported.
         # This is a sanity check. The security_contact is rigorously tested
@@ -163,7 +152,7 @@
         owning_team.addMember(weak_owner, self.owner)
         bug_team.addMember(weak_owner, self.owner)
         self.product.owner = owning_team
-        self.product.setBugSupervisor(bug_team, self.owner)
+        self.product.bug_supervisor = bug_team
         self.product.security_contact = bug_team
         login_person(weak_owner)
         form = self._makeForm()

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2012-08-08 11:48:29 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2012-08-16 12:16:23 +0000
@@ -251,13 +251,10 @@
         # and will instead receive an error in the UI.
         person = self.factory.makePerson()
         product = self.factory.makeProduct(
-            name='product1', owner=person, official_malone=True)
-        with person_logged_in(person):
-            product.setBugSupervisor(person, person)
+            name='product1', owner=person, official_malone=True,
+            bug_supervisor=person)
         product_2 = self.factory.makeProduct(
             name='product2', official_malone=True)
-        with person_logged_in(product_2.owner):
-            product_2.setBugSupervisor(product_2.owner, product_2.owner)
         bug = self.factory.makeBug(target=product, owner=person)
         # We need to commit here, otherwise all the sample data we
         # created gets destroyed when the transaction is rolled back.
@@ -1241,7 +1238,7 @@
         # For regular users, the assignee vocabulary is
         # AllUserTeamsParticipation if there is a bug supervisor defined.
         login_person(self.owner)
-        self.product.setBugSupervisor(self.owner, self.owner)
+        self.product.bug_supervisor = self.owner
         login(USER_EMAIL)
         view = BugTaskEditView(self.bugtask, LaunchpadTestRequest())
         view.initialize()
@@ -1253,7 +1250,7 @@
         # For regular users, the assignee vocabulary is
         # ValidAssignee is there is not a bug supervisor defined.
         login_person(self.owner)
-        self.product.setBugSupervisor(None, self.owner)
+        self.product.bug_supervisor = None
         login(USER_EMAIL)
         view = BugTaskEditView(self.bugtask, LaunchpadTestRequest())
         view.initialize()

=== modified file 'lib/lp/bugs/browser/tests/test_expose.py'
--- lib/lp/bugs/browser/tests/test_expose.py	2012-03-18 01:29:07 +0000
+++ lib/lp/bugs/browser/tests/test_expose.py	2012-08-16 12:16:23 +0000
@@ -262,8 +262,7 @@
         context = self.factory.makeDistribution(
             owner=self.user, members=self.bug_super_team)
         with person_logged_in(self.user):
-            context.setBugSupervisor(
-                self.bug_super_team, self.user)
+            context.bug_supervisor = self.bug_super_team
 
         expose_user_administered_teams_to_js(self.request, self.user, context,
             absoluteURL=fake_absoluteURL)

=== modified file 'lib/lp/bugs/doc/bugsubscription.txt'
--- lib/lp/bugs/doc/bugsubscription.txt	2012-08-07 13:50:53 +0000
+++ lib/lp/bugs/doc/bugsubscription.txt	2012-08-16 12:16:23 +0000
@@ -172,17 +172,15 @@
 
     >>> ubuntu_team = personset.getByName("ubuntu-team")
 
-    >>> linux_source.distribution.setBugSupervisor(ubuntu_team, ubuntu_team)
+    >>> linux_source.distribution.bug_supervisor = ubuntu_team
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers())
     No Privileges Person
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers())
     No Privileges Person
     Sample Person
-    Ubuntu Team
 
 After adding a product bugtask we can see that the upstream bug
 supervisor is also an indirect subscriber.
@@ -195,36 +193,28 @@
     <BugTask ...>
 
     >>> lifeless = personset.getByName("lifeless")
-    >>> firefox.setBugSupervisor(lifeless, lifeless)
+    >>> firefox.bug_supervisor = lifeless
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
 If there were no upstream product bug subscribers, the product owner
 would be used instead.
 
-    >>> firefox.setBugSupervisor(None, None)
+    >>> firefox.bug_supervisor = None
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> previous_owner = firefox.owner
 
@@ -232,18 +222,14 @@
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> firefox.owner = previous_owner
-    >>> firefox.setBugSupervisor(lifeless, lifeless)
+    >>> firefox.bug_supervisor = lifeless
 
 IBug.getAlsoNotifiedSubscribers() and IBug.getIndirectSubscribers() take
 an optional parameter `level` allowing us to filter the result by
@@ -267,30 +253,22 @@
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers(
     ...     level=BugNotificationLevel.COMMENTS))
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers(
     ...     level=BugNotificationLevel.COMMENTS))
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers(
     ...     level=BugNotificationLevel.LIFECYCLE))
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers(
     ...     level=BugNotificationLevel.LIFECYCLE))
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
 If No Privileges Person created a single filter with a notification
 level set to LIFECYCLE, he will not be included, if the parameter
@@ -305,28 +283,20 @@
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers(
     ...     level=BugNotificationLevel.LIFECYCLE))
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers(
     ...     level=BugNotificationLevel.LIFECYCLE))
     No Privileges Person
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers(
     ...     level=BugNotificationLevel.METADATA))
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers(
     ...     level=BugNotificationLevel.METADATA))
-    Robert Collins
     Sample Person
-    Ubuntu Team
 
 3. Direct subscribers of duplicate bugs.
 
@@ -351,16 +321,13 @@
     >>> print_displayname(linux_source_bug_dupe.getIndirectSubscribers())
     No Privileges Person
     Stuart Bishop
-    Ubuntu Team
 
     >>> linux_source_bug_dupe.markAsDuplicate(linux_source_bug)
 
     >>> print_displayname(linux_source_bug.getIndirectSubscribers())
     No Privileges Person
-    Robert Collins
     Sample Person
     Scott James Remnant
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getSubscribersFromDuplicates())
     Scott James Remnant
@@ -369,8 +336,7 @@
 he will no longer appear in the list of subscribers of the duplicate
 bug.
 
-    >>> subscription_keybuk = linux_source.addBugSubscription(
-    ...     keybuk, keybuk)
+    >>> subscription_keybuk = linux_source.addBugSubscription(keybuk, keybuk)
     >>> linux_source_bug.getSubscribersFromDuplicates()
     ()
 
@@ -415,13 +381,11 @@
     No Privileges Person
     Sample Person
     Scott James Remnant
-    Ubuntu Team
 
     >>> print_displayname(linux_source_bug.getAlsoNotifiedSubscribers())
     No Privileges Person
     Sample Person
     Scott James Remnant
-    Ubuntu Team
 
 To find out which email addresses should receive a notification email on
 a bug, and why, IBug.getBugNotificationRecipients() assembles an
@@ -436,7 +400,6 @@
     [('[e-mail]', 'Subscriber'),
      ('[e-mail]', u'Subscriber (linux-source-2.6.15 in Ubuntu)'),
      ('[e-mail]', 'Subscriber'),
-     ('[e-mail]', u'Subscriber (Ubuntu) @ubuntu-team'),
      ('[e-mail]', 'Assignee')]
 
 If IBug.getBugNotificationRecipients() is passed a  BugNotificationLevel
@@ -449,7 +412,6 @@
     >>> [(address, recipients.getReason(address)[1]) for address in addresses]
     [('[e-mail]', 'Subscriber'),
      ('[e-mail]', 'Subscriber'),
-     ('[e-mail]', u'Subscriber (Ubuntu) @ubuntu-team'),
      ('[e-mail]', 'Assignee')]
 
 When Sample Person is unsubscribed from linux_source_bug, he is no
@@ -463,7 +425,6 @@
     >>> [(address, recipients.getReason(address)[1]) for address in addresses]
     [('[e-mail]', 'Subscriber'),
      ('[e-mail]', 'Subscriber'),
-     ('[e-mail]', u'Subscriber (Ubuntu) @ubuntu-team'),
      ('[e-mail]', 'Assignee')]
 
 ...but remains included for the level LIFECYCLE.
@@ -476,7 +437,6 @@
     [('[e-mail]', 'Subscriber'),
      ('[e-mail]', u'Subscriber (linux-source-2.6.15 in Ubuntu)'),
      ('[e-mail]', 'Subscriber'),
-     ('[e-mail]', u'Subscriber (Ubuntu) @ubuntu-team'),
      ('[e-mail]', 'Assignee')]
 
 To find out if someone is already directly subscribed to a bug, call
@@ -646,7 +606,7 @@
 
 Let's have a look at an example for a distribution bug:
 
-    >>> ubuntu.setBugSupervisor(sample_person, sample_person)
+    >>> ubuntu.bug_supervisor = sample_person
 
     >>> params = CreateBugParams(
     ...     title="a test bug", comment="a test description",
@@ -663,7 +623,7 @@
 will be implicitly added to the notification recipients.
 
     >>> getSubscribers(new_bug)
-    ['[e-mail]', '[e-mail]', '[e-mail]']
+    ['[e-mail]']
 
 The distro contact will also be subscribed to private bugs, because
 there is no security contact:
@@ -693,7 +653,7 @@
 
 Another example, this time for an upstream:
 
-    >>> firefox.setBugSupervisor(mark, mark)
+    >>> firefox.bug_supervisor = mark
 
     >>> params = CreateBugParams(
     ...     title="a test bug", comment="a test description",
@@ -710,7 +670,7 @@
 recipients list.
 
     >>> getSubscribers(new_bug)
-    ['[e-mail]', '[e-mail]', '[e-mail]']
+    ['[e-mail]']
 
 If we create a bug task on Ubuntu in the same bug, the Ubuntu bug
 supervisor will be subscribed:
@@ -720,10 +680,6 @@
 
     >>> print '\n'.join(getSubscribers(new_bug))
     [e-mail]
-    [e-mail]
-    [e-mail]
-    [e-mail]
-    [e-mail]
 
 But still, only Foo Bar is explicitly subscribed.
 
@@ -735,7 +691,7 @@
 product.owner is used instead. So, if Firefox's bug supervisor is unset,
 Sample Person, the Firefox "owner" will get subscribed instead:
 
-    >>> firefox.setBugSupervisor(None, None)
+    >>> firefox.bug_supervisor = None
 
     >>> params = CreateBugParams(
     ...     title="a test bug", comment="a test description",
@@ -753,8 +709,6 @@
 
     >>> print '\n'.join(getSubscribers(new_bug))
     [e-mail]
-    [e-mail]
-    [e-mail]
 
 The upstream maintainer will be subscribed to security-related private
 bugs, because upstream has no security contact, in this case.
@@ -769,8 +723,6 @@
 
     >>> print '\n'.join(getSubscribers(new_bug))
     [e-mail]
-    [e-mail]
-    [e-mail]
     [e-mail]
 
 Now let's create a bug on a specific package, which has no package bug
@@ -787,7 +739,7 @@
     >>> new_bug = evolution.createBug(params)
 
     >>> getSubscribers(new_bug)
-    ['[e-mail]', '[e-mail]', '[e-mail]']
+    ['[e-mail]']
 
 Adding a package bug contact for evolution will mean that that package
 bug contact gets implicitly subscribed to all bugs ever opened on that
@@ -807,7 +759,7 @@
     [u'Foo Bar']
 
     >>> getSubscribers(new_bug)
-    ['[e-mail]', '[e-mail]', '[e-mail]']
+    ['[e-mail]', '[e-mail]']
 
 And the Ubuntu team will be implicitly subscribed to future bugs:
 
@@ -822,7 +774,7 @@
     [u'Foo Bar']
 
     >>> getSubscribers(new_bug)
-    ['[e-mail]', '[e-mail]', '[e-mail]']
+    ['[e-mail]', '[e-mail]']
 
 The distribution maintainer, Ubuntu Team, gets subscribed to the private
 security bug filed on a package, because Ubuntu has no security contact:

=== modified file 'lib/lp/bugs/doc/bugtask-search.txt'
--- lib/lp/bugs/doc/bugtask-search.txt	2012-08-08 11:48:29 +0000
+++ lib/lp/bugs/doc/bugtask-search.txt	2012-08-16 12:16:23 +0000
@@ -96,7 +96,7 @@
 bugs return all of Firefox's bugs.
 
     >>> login('[e-mail]')
-    >>> firefox.setBugSupervisor(no_priv, no_priv)
+    >>> firefox.bug_supervisor = no_priv
 
     >>> found_bugtasks = bugtask_set.search(no_priv_bug_supervisor)
     >>> found_bugtasks.count() == firefox_bugs.count()
@@ -121,7 +121,7 @@
     >>> ubuntu_bugs.count() > 0
     True
 
-    >>> ubuntu.setBugSupervisor(no_priv, no_priv)
+    >>> ubuntu.bug_supervisor = no_priv
     >>> found_bugtasks = bugtask_set.search(no_priv_bug_supervisor)
     >>> found_bugtasks.count() == firefox_bugs.count() + ubuntu_bugs.count()
     True

=== modified file 'lib/lp/bugs/doc/initial-bug-contacts.txt'
--- lib/lp/bugs/doc/initial-bug-contacts.txt	2012-05-22 12:05:51 +0000
+++ lib/lp/bugs/doc/initial-bug-contacts.txt	2012-08-16 12:16:23 +0000
@@ -301,12 +301,7 @@
 
     >>> mozilla_firefox = getUtility(IProductSet).get(4)
 
-Let's make Foo Bar a bug supervisor for upstream firefox:
-
-    >>> mozilla_firefox.setBugSupervisor(foobar, foobar)
-
-Then we'll reassign bug #2 in Ubuntu to be in Firefox, noting that Foo
-Bar gets subscribed to the bug in the process:
+Then we'll reassign bug #2 in Ubuntu to be in Firefox:
 
     >>> bug_two_in_ubuntu = getUtility(IBugTaskSet).get(3)
     >>> print bug_two_in_ubuntu.bug.id
@@ -330,46 +325,6 @@
     >>> notify(product_changed)
     >>> transaction.commit()
 
-With the product changed, we can see that Foo Bar is now subscribed:
-
-    >>> print '\n'.join(subscriber_names(bug_two_in_ubuntu.bug))
-    Foo Bar
-    Sample Person
-    Steve Alexander
-    Ubuntu Team
-
-And Foo Bar gets an email containing complete information about the bug
-report. It states that he received the email because he is the bug
-supervisor for Mozilla Firefox.
-
-    >>> test_emails = list(stub.test_emails)
-    >>> test_emails.sort(by_to_addrs)
-
-    >>> len(test_emails)
-    1
-
-    >>> from_addr, to_addr, raw_message = test_emails.pop()
-    >>> print from_addr
-    [e-mail]
-
-    >>> print to_addr
-    ['[e-mail]']
-
-    >>> msg = email.message_from_string(raw_message)
-    >>> msg['Subject']
-    '[Bug 2] [NEW] Blackhole Trash folder'
-
-    >>> print msg.get_payload(decode=True)
-    You have been subscribed to a public bug:
-    ...
-    ** Affects: firefox
-    ...
-    --
-    Blackhole Trash folder
-    http://bugs.launchpad.dev/bugs/2
-    You received this bug notification because you
-    are subscribed to Mozilla Firefox.
-
 
 Teams as bug supervisors
 ------------------------

=== modified file 'lib/lp/bugs/interfaces/bugsupervisor.py'
--- lib/lp/bugs/interfaces/bugsupervisor.py	2011-12-24 16:54:44 +0000
+++ lib/lp/bugs/interfaces/bugsupervisor.py	2012-08-16 12:16:23 +0000
@@ -11,16 +11,7 @@
     'IHasBugSupervisor',
     ]
 
-from lazr.restful.declarations import (
-    call_with,
-    export_write_operation,
-    exported,
-    mutator_for,
-    operation_for_version,
-    operation_parameters,
-    REQUEST_USER,
-    )
-from lazr.restful.interface import copy_field
+from lazr.restful.declarations import exported
 from zope.interface import Interface
 
 from lp import _
@@ -33,16 +24,5 @@
         title=_("Bug Supervisor"),
         description=_(
             "The Launchpad id of the person or team (preferred) responsible "
-            "for bug management. Mail about all bug activity will be sent to "
-            "the supervisor by default. The bug supervisor can change the "
-            "bug mail rules to limit the volume of email."),
-        required=False, vocabulary='ValidPersonOrTeam', readonly=True))
-
-    @mutator_for(bug_supervisor)
-    @call_with(user=REQUEST_USER)
-    @operation_parameters(
-        bug_supervisor=copy_field(bug_supervisor))
-    @export_write_operation()
-    @operation_for_version('beta')
-    def setBugSupervisor(bug_supervisor, user):
-        """Set the bug contact and create a bug subscription."""
+            "for bug management."),
+        required=False, vocabulary='ValidPersonOrTeam', readonly=False))

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2012-08-07 03:47:15 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2012-08-16 12:16:23 +0000
@@ -1,8 +1,6 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# pylint: disable-msg=E0211,E0213,E0602
-
 """Bug task interfaces."""
 
 __metaclass__ = type
@@ -785,7 +783,7 @@
         """
 
     def userHasDriverPrivileges(user):
-        """Does the user have driver privledges on the current bugtask?
+        """Does the user have driver privileges on the current bugtask?
 
         :return: A boolean.
         """

=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py	2012-08-08 11:48:29 +0000
+++ lib/lp/bugs/model/tests/test_bug.py	2012-08-16 12:16:23 +0000
@@ -9,7 +9,6 @@
     )
 
 from pytz import UTC
-from storm.expr import Join
 from storm.store import Store
 from testtools.testcase import ExpectedException
 from zope.component import getUtility
@@ -29,7 +28,6 @@
     BugNotification,
     BugSubscriptionInfo,
     )
-from lp.bugs.model.bugnotification import BugNotificationRecipient
 from lp.registry.enums import InformationType
 from lp.registry.interfaces.accesspolicy import (
     IAccessArtifactSource,
@@ -940,10 +938,8 @@
         # This is to protect ubuntu's workflow, which differs from the
         # Launchpad norm.
         ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
-        admin = getUtility(ILaunchpadCelebrities).admin
         ubuntu = removeSecurityProxy(ubuntu)
-        ubuntu.setBugSupervisor(
-            self.factory.makePerson(name='supervisor'), admin)
+        ubuntu.bug_supervisor = self.factory.makePerson(name='supervisor')
         bug = self.factory.makeBug(
             information_type=InformationType.PRIVATESECURITY,
             target=ubuntu)
@@ -954,7 +950,7 @@
             InformationType.USERDATA, who=bug.owner)
         subscribers = bug.getDirectSubscribers()
         self.assertContentEqual(initial_subscribers, subscribers)
-        ubuntu.setBugSupervisor(None, ubuntu.owner)
+        ubuntu.bug_supervisor = None
 
 
 class TestBugActivityMethods(TestCaseWithFactory):

=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py	2012-08-08 07:22:51 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py	2012-08-16 12:16:23 +0000
@@ -371,7 +371,7 @@
             bugtask.transitionToAssignee(assignee)
         supervisor = self.factory.makePerson()
         with person_logged_in(bugtask.target.owner):
-            bugtask.target.setBugSupervisor(supervisor, supervisor)
+            bugtask.target.bug_supervisor = supervisor
         structural_subscriber = self.factory.makePerson()
         with person_logged_in(structural_subscriber):
             bugtask.target.addSubscription(
@@ -392,8 +392,7 @@
         # the assignee, supervisor and structural subscriber do.
         found_subscribers = self.getInfo().also_notified_subscribers
         self.assertContentEqual(
-            [assignee, supervisor, structural_subscriber],
-            found_subscribers)
+            [assignee, structural_subscriber], found_subscribers)
 
     def test_also_notified_subscribers_muted(self):
         # If someone is muted, they are not listed in the
@@ -405,13 +404,10 @@
         # when they are not muted.
         found_subscribers = self.getInfo().also_notified_subscribers
         self.assertContentEqual(
-            [assignee, supervisor, structural_subscriber],
-            found_subscribers)
+            [assignee, structural_subscriber], found_subscribers)
         # Now we mute all of the subscribers.
         with person_logged_in(assignee):
             self.bug.mute(assignee, assignee)
-        with person_logged_in(supervisor):
-            self.bug.mute(supervisor, supervisor)
         with person_logged_in(structural_subscriber):
             self.bug.mute(structural_subscriber, structural_subscriber)
         # Now we don't see them.

=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
--- lib/lp/bugs/model/tests/test_bugtask.py	2012-08-14 23:27:07 +0000
+++ lib/lp/bugs/model/tests/test_bugtask.py	2012-08-16 12:16:23 +0000
@@ -934,13 +934,10 @@
 
     def _setBugSupervisorData(self):
         """Helper function used by sub-classes to setup bug supervisors."""
+        self.supervisor_member = self.factory.makePerson()
         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)
+            owner=self.target_owner_member, members=[self.supervisor_member])
+        self.target.bug_supervisor = self.supervisor_team
 
     def _setBugSupervisorDataNone(self):
         """Helper for sub-classes to work around setting a bug supervisor."""
@@ -3199,10 +3196,8 @@
 
     def test_pillar_bug_supervisor(self):
         # The pillar bug supervisor has privileges.
-        pillar = self.factory.makeProduct()
         bugsupervisor = self.factory.makePerson()
-        removeSecurityProxy(pillar).setBugSupervisor(
-            bugsupervisor, self.celebrities.admin)
+        pillar = self.factory.makeProduct(bug_supervisor=bugsupervisor)
         bugtask = self.factory.makeBugTask(target=pillar)
         self.assertTrue(
             bugtask.userHasBugSupervisorPrivileges(bugsupervisor))

=== modified file 'lib/lp/bugs/model/tests/test_bugtask_status.py'
--- lib/lp/bugs/model/tests/test_bugtask_status.py	2012-08-13 19:34:10 +0000
+++ lib/lp/bugs/model/tests/test_bugtask_status.py	2012-08-16 12:16:23 +0000
@@ -386,10 +386,9 @@
     def makePersonAndTask(self):
         self.owner = self.factory.makePerson()
         self.person = self.factory.makePerson()
-        self.product = self.factory.makeProduct(owner=self.owner)
+        self.product = self.factory.makeProduct(
+            owner=self.owner, bug_supervisor=self.person)
         self.task = self.factory.makeBugTask(target=self.product)
-        with person_logged_in(self.owner):
-            self.product.setBugSupervisor(self.person, self.person)
 
 
 class TestBugTaskStatusTransitionBugSupervisorTeamMember(
@@ -400,10 +399,9 @@
         self.owner = self.factory.makePerson()
         self.person = self.factory.makePerson()
         self.team = self.factory.makeTeam(members=[self.person])
-        self.product = self.factory.makeProduct(owner=self.owner)
+        self.product = self.factory.makeProduct(
+            owner=self.owner, bug_supervisor=self.team)
         self.task = self.factory.makeBugTask(target=self.product)
-        with person_logged_in(self.owner):
-            self.product.setBugSupervisor(self.team, self.team)
 
 
 class TestBugTaskStatusTransitionBugWatchUpdater(

=== modified file 'lib/lp/bugs/model/tests/test_bugtasksearch.py'
--- lib/lp/bugs/model/tests/test_bugtasksearch.py	2012-08-08 11:48:29 +0000
+++ lib/lp/bugs/model/tests/test_bugtasksearch.py	2012-08-16 12:16:23 +0000
@@ -936,7 +936,7 @@
     def setSupervisor(self, supervisor):
         """Set the bug supervisor for the bug task target."""
         with person_logged_in(self.owner):
-            self.searchtarget.setBugSupervisor(supervisor, self.owner)
+            self.searchtarget.bug_supervisor = supervisor
 
 
 class ProductTarget(BugTargetTestBase, ProductAndDistributionTests,
@@ -1103,7 +1103,7 @@
         with person_logged_in(self.owner):
             # We must set the bug supervisor for each bug task target
             for bugtask in self.bugtasks:
-                bugtask.target.setBugSupervisor(supervisor, self.owner)
+                bugtask.target.bug_supervisor = supervisor
 
     def findBugtaskForOtherProduct(self, bugtask):
         # Return the bugtask for the product that not related to the
@@ -1613,8 +1613,7 @@
     def setSupervisor(self, supervisor):
         """Set the bug supervisor for the bug task target."""
         with person_logged_in(self.owner):
-            self.searchtarget.distribution.setBugSupervisor(
-                supervisor, self.owner)
+            self.searchtarget.distribution.bug_supervisor = supervisor
 
     def targetToGroup(self, target):
         return target.sourcepackagename.id

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt	2012-07-07 21:44:45 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt	2012-08-16 12:16:23 +0000
@@ -54,7 +54,7 @@
 For a product bug supervisor.
 
     >>> login("[e-mail]")
-    >>> firefox.setBugSupervisor(no_priv, no_priv)
+    >>> firefox.bug_supervisor = no_priv
     >>> user_sees_importance_widget(
     ...     user=no_priv,
     ...     url="http://bugs.launchpad.dev/firefox/+bug/1/+editstatus")
@@ -77,7 +77,7 @@
 he can no longer see the widget.
 
     >>> login("[e-mail]")
-    >>> firefox.setBugSupervisor(None, None)
+    >>> firefox.bug_supervisor = None
     >>> user_sees_importance_widget(
     ...     user=no_priv,
     ...     url="http://bugs.launchpad.dev/firefox/+bug/1/+editstatus")
@@ -86,7 +86,7 @@
 For a distribution bug supervisor.
 
     >>> login("[e-mail]")
-    >>> ubuntu.setBugSupervisor(no_priv, no_priv)
+    >>> ubuntu.bug_supervisor = no_priv
     >>> user_sees_importance_widget(
     ...     user=no_priv,
     ...     url='http://bugs.launchpad.dev/'
@@ -108,7 +108,7 @@
 For someone else, on Ubuntu.
 
     >>> login("[e-mail]")
-    >>> ubuntu.setBugSupervisor(None, None)
+    >>> ubuntu.bug_supervisor = None
     >>> user_sees_importance_widget(
     ...     user=no_priv,
     ...     url='http://bugs.launchpad.dev/'

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt	2012-01-06 17:13:25 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt	2012-08-16 12:16:23 +0000
@@ -104,7 +104,7 @@
     >>> from lp.registry.interfaces.product import IProductSet
     >>> jokosher = getUtility(IProductSet).getByName('jokosher')
     >>> foobar = getUtility(IPersonSet).getByName('name16')
-    >>> jokosher.setBugSupervisor(foobar, foobar)
+    >>> jokosher.bug_supervisor = foobar
 
 To avoid any confusion, the option to assign somebody else is only
 shown if the user has sufficient privileges to assign anybody or if

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt	2011-12-24 15:18:32 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-edit-email-address-bugtask.txt	2012-08-16 12:16:23 +0000
@@ -86,7 +86,7 @@
 And the bug supervisor can't see the widgets either.
 
     >>> login("[e-mail]")
-    >>> gnome_terminal.setBugSupervisor(no_priv, no_priv)
+    >>> gnome_terminal.bug_supervisor = no_priv
     >>> print_widget_visibility(
     ...     user=no_priv,
     ...     url=('http://bugs.launchpad.dev/'
@@ -149,7 +149,7 @@
 A bug supervisor can see both.
 
     >>> login("[e-mail]")
-    >>> alsa_utils.setBugSupervisor(no_priv, no_priv)
+    >>> alsa_utils.bug_supervisor = no_priv
     >>> print_widget_visibility(
     ...     user=no_priv,
     ...     url=('http://bugs.launchpad.dev/'

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-view-editable-bug-task.txt	2012-08-16 12:16:23 +0000
@@ -20,7 +20,7 @@
     >>> firefox = IMasterObject(getUtility(IProductSet).getByName("firefox"))
     >>> sample_person = IMasterObject(
     ...     getUtility(IPersonSet).getByName("name12"))
-    >>> firefox.setBugSupervisor(sample_person, sample_person)
+    >>> firefox.bug_supervisor = sample_person
 
     >>> flush_database_updates()
 

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt	2012-03-06 11:20:54 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt	2012-08-16 12:16:23 +0000
@@ -52,7 +52,7 @@
     >>> login('[e-mail]')
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> foobar = getUtility(IPersonSet).getByName('name16')
-    >>> ubuntu.setBugSupervisor(foobar, foobar)
+    >>> ubuntu.bug_supervisor = foobar
     >>> transaction.commit()
     >>> logout()
 

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2012-07-27 01:15:04 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2012-08-16 12:16:23 +0000
@@ -1440,7 +1440,7 @@
 
     >>> with lp_dbuser():
     ...     login('[e-mail]')
-    ...     upstream_task.pillar.setBugSupervisor(email_user, email_user)
+    ...     upstream_task.pillar.bug_supervisor = email_user
 
     >>> ignored = login_person(email_user)
 
@@ -1459,7 +1459,7 @@
 
     >>> with lp_dbuser():
     ...     login('[e-mail]')
-    ...     upstream_task.pillar.setBugSupervisor(None, None)
+    ...     upstream_task.pillar.bug_supervisor = None
 
     >>> login('[e-mail]')
 

=== removed file 'lib/lp/bugs/tests/has-bug-supervisor.txt'
--- lib/lp/bugs/tests/has-bug-supervisor.txt	2010-10-14 18:42:19 +0000
+++ lib/lp/bugs/tests/has-bug-supervisor.txt	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-= IHasBugSupervisor =
-
-Bug supervisors are people or teams who are responsible for dealing with
-bugs pertaining to a target. All objects with a bug supervisor are also
-structural subscription targets. When the bug supervisor for such an object
-is set, a new bug subscription is created as well.
-
-    >>> list(target.bug_subscriptions)
-    []
-
-    >>> print target.bug_supervisor
-    None
-
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> personset = getUtility(IPersonSet)
-    >>> no_priv = personset.getByEmail("[e-mail]")
-    >>> foo_bar = personset.getByEmail("[e-mail]")
-
-    >>> login("[e-mail]")
-
-We set no_priv as the bug supervisor for the target.
-
-    >>> target.setBugSupervisor(no_priv, foo_bar)
-
-The bug supervisor can be retrieved using the `bug_supervisor` property.
-
-    >>> print target.bug_supervisor.preferredemail.email
-    [e-mail]
-
-But we can't use it to set the bug supervisor.
-
-    >>> target.bug_supervisor = None
-    Traceback (most recent call last):
-    ...
-    ForbiddenAttribute: ('bug_supervisor', <...>)
-
-After setting no_priv as the bug supervisor, a bug subscription is created
-for the target.
-
-    >>> for bug_subscription in target.bug_subscriptions:
-    ...     print bug_subscription.subscriber.preferredemail.email
-    [e-mail]
-
-And now no_priv is an indirect subscriber to any bug filed on
-the target.
-
-    >>> bug = filebug(target, 'test bug')
-    >>> no_priv in bug.getIndirectSubscribers()
-    True
-
-If no_priv unsubscribes, he is still set as the bug supervisor.
-
-    >>> target.removeBugSubscription(no_priv, no_priv)
-    >>> print target.bug_supervisor.preferredemail.email
-    [e-mail]
-    >>> no_priv in bug.getIndirectSubscribers()
-    False
-
-But we can remove the bug supervisor by setting it to None.
-
-    >>> target.setBugSupervisor(None, None)
-    >>> print target.bug_supervisor
-    None
-
-Note that removing a person as a bug contact supervisor not remove their
-subscription to the target, if it exists.

=== modified file 'lib/lp/bugs/tests/test_bug.py'
--- lib/lp/bugs/tests/test_bug.py	2012-08-15 02:30:46 +0000
+++ lib/lp/bugs/tests/test_bug.py	2012-08-16 12:16:23 +0000
@@ -292,7 +292,7 @@
         # canTransitionToAssignee() will return False for `person` if
         # another Person is passed as `assignee`.
         with person_logged_in(target.owner):
-            target.setBugSupervisor(target.owner, target.owner)
+            target.bug_supervisor = target.owner
         with person_logged_in(person):
             params = CreateBugParams(
                 owner=person, title="A bug", comment="Nothing important.",

=== removed file 'lib/lp/bugs/tests/test_bugcontact.py'
--- lib/lp/bugs/tests/test_bugcontact.py	2012-06-06 16:04:34 +0000
+++ lib/lp/bugs/tests/test_bugcontact.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Test harness for running tests against IHasBugcontact
-implementations.
-"""
-
-import unittest
-
-from lp.bugs.tests.test_structuralsubscriptiontarget import (
-    distributionSetUp,
-    productSetUp,
-    )
-from lp.testing.layers import DatabaseFunctionalLayer
-from lp.testing.systemdocs import (
-    LayeredDocFileSuite,
-    tearDown,
-    )
-
-
-def test_suite():
-    """Return the `IHasBugSupervisor` TestSuite."""
-    suite = unittest.TestSuite()
-
-    setUpMethods = [
-        productSetUp,
-        distributionSetUp,
-        ]
-
-    testname = 'has-bug-supervisor.txt'
-    for setUpMethod in setUpMethods:
-        id_ext = "%s-%s" % (testname, setUpMethod.func_name)
-        test = LayeredDocFileSuite(
-            testname,
-            id_extensions=[id_ext],
-            setUp=setUpMethod, tearDown=tearDown,
-            layer=DatabaseFunctionalLayer)
-        suite.addTest(test)
-
-    return suite

=== modified file 'lib/lp/bugs/tests/test_bugvisibility.py'
--- lib/lp/bugs/tests/test_bugvisibility.py	2012-08-08 11:48:29 +0000
+++ lib/lp/bugs/tests/test_bugvisibility.py	2012-08-16 12:16:23 +0000
@@ -50,9 +50,7 @@
         self.bug_team_member = self.factory.makePerson(name="bugteammember")
         with celebrity_logged_in('admin'):
             self.bug_team.addMember(self.bug_team_member, self.product.owner)
-            self.product.setBugSupervisor(
-                bug_supervisor=self.bug_team,
-                user=self.product.owner)
+            self.product.bug_supervisor = self.bug_team
         self.bug = self.factory.makeBug(
             owner=self.owner, target=self.product,
             information_type=InformationType.USERDATA)

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2012-08-11 02:18:44 +0000
+++ lib/lp/registry/browser/product.py	2012-08-16 12:16:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Browser views for products."""
@@ -114,7 +114,6 @@
 from lp.app.widgets.itemswidgets import (
     CheckBoxMatrixWidget,
     LaunchpadRadioWidget,
-    LaunchpadRadioWidgetWithDescription,
     )
 from lp.app.widgets.popup import PersonPickerWidget
 from lp.app.widgets.product import (
@@ -612,8 +611,7 @@
         return Link('+branchvisibility', text, icon='edit')
 
 
-class ProductBugsMenu(PillarBugsMenu,
-                      ProductEditLinksMixin):
+class ProductBugsMenu(PillarBugsMenu, ProductEditLinksMixin):
 
     usedfor = IProduct
     facet = 'bugs'
@@ -1543,10 +1541,7 @@
         else:
             return canonical_url(getUtility(IProductSet))
 
-    @property
-    def cancel_url(self):
-        """See `LaunchpadFormView`."""
-        return self.next_url
+    cancel_url = next_url
 
 
 class ProductValidationMixin:

=== modified file 'lib/lp/registry/browser/tests/test_edit_permissions.py'
--- lib/lp/registry/browser/tests/test_edit_permissions.py	2012-01-01 02:58:52 +0000
+++ lib/lp/registry/browser/tests/test_edit_permissions.py	2012-08-16 12:16:23 +0000
@@ -102,17 +102,15 @@
     def setupTarget(self):
         self.d_owner = self.factory.makePerson()
         login_person(self.d_owner)
-        self.distro = self.factory.makeDistribution(name='youbuntu',
-                                                    owner=self.d_owner)
+        self.distro = self.factory.makeDistribution(
+            name='youbuntu', owner=self.d_owner)
         self.target = self.factory.makeDistributionSourcePackage(
             distribution=self.distro)
-        self.supervisor_team = self.factory.makeTeam(
-            owner=self.d_owner)
+        self.supervisor_team = self.factory.makeTeam(owner=self.d_owner)
         self.supervisor_member = self.factory.makePerson()
         self.supervisor_team.addMember(
             self.supervisor_member, self.d_owner)
-        self.distro.setBugSupervisor(
-            self.supervisor_team, self.d_owner)
+        self.distro.bug_supervisor = self.supervisor_team
 
     def test_bug_supervisor_can_edit(self):
         login_person(self.supervisor_member)

=== modified file 'lib/lp/registry/browser/tests/test_subscription_links.py'
--- lib/lp/registry/browser/tests/test_subscription_links.py	2012-06-04 16:13:51 +0000
+++ lib/lp/registry/browser/tests/test_subscription_links.py	2012-08-16 12:16:23 +0000
@@ -281,10 +281,7 @@
 
     def test_subscribe_link_user_with_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            supervisor = self.factory.makePerson()
-            self.target.setBugSupervisor(
-                supervisor, admin)
+            self.target.bug_supervisor = self.factory.makePerson()
         self._create_scenario(self.regular_user)
         self.assertLinksMissing()
 
@@ -294,9 +291,7 @@
 
     def test_subscribe_link_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            self.target.setBugSupervisor(
-                self.regular_user, admin)
+            self.target.bug_supervisor = self.regular_user
         self._create_scenario(self.regular_user)
         self.assertLinksPresent()
 
@@ -322,10 +317,7 @@
 
     def test_subscribe_link_user_with_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            supervisor = self.factory.makePerson()
-            self.target.setBugSupervisor(
-                supervisor, admin)
+            self.target.bug_supervisor = self.factory.makePerson()
         self._create_scenario(self.regular_user)
         self.assertLinksMissing()
 
@@ -335,9 +327,7 @@
 
     def test_subscribe_link_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            self.target.setBugSupervisor(
-                self.regular_user, admin)
+            self.target.bug_supervisor = self.regular_user
         self._create_scenario(self.regular_user)
         self.assertLinksPresent()
 
@@ -366,10 +356,7 @@
 
     def test_subscribe_link_user_with_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            supervisor = self.factory.makePerson()
-            self.distro.setBugSupervisor(
-                supervisor, admin)
+            self.distro.bug_supervisor = self.factory.makePerson()
         self._create_scenario(self.regular_user)
         self.assertLinksPresent()
 
@@ -379,9 +366,7 @@
 
     def test_subscribe_link_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            self.distro.setBugSupervisor(
-                self.regular_user, admin)
+            self.distro.bug_supervisor = self.regular_user
         self._create_scenario(self.regular_user)
         self.assertLinksPresent()
 
@@ -561,9 +546,7 @@
 
     def test_subscribe_link_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            self.target.setBugSupervisor(
-                self.regular_user, admin)
+            self.target.bug_supervisor = self.regular_user
         self._create_scenario(self.regular_user)
         self.assertLinksMissing()
 
@@ -605,9 +588,7 @@
 
     def test_subscribe_link_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            self.distro.setBugSupervisor(
-                self.regular_user, admin)
+            self.distro.bug_supervisor = self.regular_user
         self._create_scenario(self.regular_user)
         self.assertLinksMissing()
 
@@ -631,10 +612,7 @@
 
     def test_subscribe_link_user_with_bug_super(self):
         with celebrity_logged_in('admin'):
-            admin = getUtility(ILaunchBag).user
-            supervisor = self.factory.makePerson()
-            self.distro.setBugSupervisor(
-                supervisor, admin)
+            self.distro.bug_supervisor = self.factory.makePerson()
         self._create_scenario(self.regular_user)
         self.assertLinksMissing()
 

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2012-08-10 06:40:08 +0000
+++ lib/lp/registry/configure.zcml	2012-08-16 12:16:23 +0000
@@ -1367,8 +1367,7 @@
                 bug_supervisor"/>
         <require
             permission="launchpad.Edit"
-            attributes="
-                setBugSupervisor"/>
+            set_attributes="bug_supervisor"/>
     </class>
 
     <!-- ProductWithLicenses
@@ -1642,8 +1641,7 @@
                 bug_supervisor"/>
         <require
             permission="launchpad.Edit"
-            attributes="
-                setBugSupervisor"/>
+            set_attributes="bug_supervisor"/>
     </class>
     <adapter
         for="lp.registry.interfaces.distribution.IDistribution"

=== modified file 'lib/lp/registry/doc/private-team-roles.txt'
--- lib/lp/registry/doc/private-team-roles.txt	2012-08-13 19:34:10 +0000
+++ lib/lp/registry/doc/private-team-roles.txt	2012-08-16 12:16:23 +0000
@@ -223,8 +223,8 @@
 A public team and a private team can be a project bug supervisor.
 
     >>> product = factory.makeProduct()
-    >>> product.setBugSupervisor(public_team, admin_user)
-    >>> product.setBugSupervisor(priv_team, admin_user)
+    >>> product.bug_supervisor = public_team
+    >>> product.bug_supervisor = priv_team
 
 
 Product Series Roles

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2012-08-10 03:30:46 +0000
+++ lib/lp/registry/interfaces/product.py	2012-08-16 12:16:23 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# pylint: disable-msg=E0211,E0213
-
 """Interfaces including and related to IProduct."""
 
 __metaclass__ = type

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2012-08-08 05:36:44 +0000
+++ lib/lp/registry/model/distribution.py	2012-08-16 12:16:23 +0000
@@ -81,7 +81,6 @@
     DB_UNRESOLVED_BUGTASK_STATUSES,
     )
 from lp.bugs.interfaces.bugtaskfilter import OrderedBugTask
-from lp.bugs.model.bug import BugSet
 from lp.bugs.model.bugtarget import (
     BugTargetBase,
     OfficialBugTagTargetMixin,
@@ -1578,12 +1577,6 @@
                  bugs_with_upstream_patches))
         return results
 
-    def setBugSupervisor(self, bug_supervisor, user):
-        """See `IHasBugSupervisor`."""
-        self.bug_supervisor = bug_supervisor
-        if bug_supervisor is not None:
-            self.addBugSubscription(bug_supervisor, user)
-
     def getAllowedBugInformationTypes(self):
         """See `IDistribution.`"""
         types = set(InformationType.items)

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2012-08-10 06:39:58 +0000
+++ lib/lp/registry/model/product.py	2012-08-16 12:16:23 +0000
@@ -92,7 +92,6 @@
 from lp.bugs.interfaces.bugsummary import IBugSummaryDimension
 from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
 from lp.bugs.interfaces.bugtaskfilter import OrderedBugTask
-from lp.bugs.model.bug import BugSet
 from lp.bugs.model.bugtarget import (
     BugTargetBase,
     OfficialBugTagTargetMixin,
@@ -1384,12 +1383,6 @@
             DistroSeries.distributionID == Distribution.id,
             ).config(distinct=True).order_by(Distribution.name)
 
-    def setBugSupervisor(self, bug_supervisor, user):
-        """See `IHasBugSupervisor`."""
-        self.bug_supervisor = bug_supervisor
-        if bug_supervisor is not None:
-            self.addBugSubscription(bug_supervisor, user)
-
     def composeCustomLanguageCodeMatch(self):
         """See `HasCustomLanguageCodesMixin`."""
         return CustomLanguageCode.product == self

=== modified file 'lib/lp/registry/tests/test_product.py'
--- lib/lp/registry/tests/test_product.py	2012-08-14 23:27:07 +0000
+++ lib/lp/registry/tests/test_product.py	2012-08-16 12:16:23 +0000
@@ -59,7 +59,6 @@
     admin_logged_in,
     celebrity_logged_in,
     login,
-    login_person,
     person_logged_in,
     TestCase,
     TestCaseWithFactory,
@@ -801,31 +800,6 @@
         self.assertThat(self.product, DoesNotSnapshot(omitted, IProduct))
 
 
-class BugSupervisorTestCase(TestCaseWithFactory):
-    """A TestCase for bug supervisor management."""
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        super(BugSupervisorTestCase, self).setUp()
-        self.person = self.factory.makePerson()
-        self.product = self.factory.makeProduct(owner=self.person)
-        login_person(self.person)
-
-    def testPersonCanSetSelfAsSupervisor(self):
-        # A person can set themselves as bug supervisor for a product.
-        # This is a regression test for bug 438985.
-        self.product.setBugSupervisor(
-            bug_supervisor=self.person, user=self.person)
-
-        self.assertEqual(
-            self.product.bug_supervisor, self.person,
-            "%s should be bug supervisor for %s. "
-            "Instead, bug supervisor for firefox is %s" % (
-            self.person.name, self.product.name,
-            self.product.bug_supervisor.name))
-
-
 class TestProductTranslations(TestCaseWithFactory):
     """A TestCase for accessing product translations-related attributes."""