Merge lp:~thumper/launchpad/vcs-imports-permission-review into lp:launchpad

[Tim Penhey]

Remove some more obsolete vcs-imports special cases.

A few more clean-ups responding to https://bugs.edge.launchpad.net/launchpad-code/+bug/576090/comments/4 on bug 576090.

[Michael Hudson-Doyle (mwhudson)]

Assuming this code really isn't used, looks fine.

review: Approve

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-05-17 12:43:53 +0000
+++ lib/canonical/launchpad/security.py	2010-05-25 04:43:25 +0000
@@ -1124,7 +1124,7 @@
 class EditCodeImportMachine(OnlyBazaarExpertsAndAdmins):
     """Control who can edit the object view of a CodeImportMachine.
 
-    Access is restricted to members of ~vcs-imports and Launchpad admins.
+    Access is restricted to members of ~bazaar-experts and Launchpad admins.
     """
     permission = 'launchpad.Edit'
     usedfor = ICodeImportMachine

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-05-19 22:25:43 +0000
+++ lib/lp/registry/browser/product.py	2010-05-25 04:43:25 +0000
@@ -1851,24 +1851,6 @@
             return 'Check for duplicate projects'
         return 'Registration details'
 
-    def isVCSImport(self):
-        """Is the the user vcs-imports."""
-        if self.user is None:
-            return False
-        vcs_imports = getUtility(ILaunchpadCelebrities).vcs_imports
-        return self.user.inTeam(vcs_imports)
-
-    def setUpFields(self):
-        """See `LaunchpadFormView`."""
-        super(ProjectAddStepTwo, self).setUpFields()
-        if not self.isVCSImport():
-            # vcs-imports members get it easy and are able to change
-            # the owner and reviewed status during the edit process;
-            # this saves time wasted on getting to product/+admin.
-            # The fields are not displayed for other people though.
-            self.form_fields = self.form_fields.omit(
-                'owner', 'license_reviewed')
-
     def setUpWidgets(self):
         """See `LaunchpadFormView`."""
         super(ProjectAddStepTwo, self).setUpWidgets()
@@ -1941,14 +1923,6 @@
 
     def main_action(self, data):
         """See `MultiStepView`."""
-        if not self.isVCSImport():
-            # Zope makes sure these are never set, since they are not in
-            # self.form_fields
-            assert "owner" not in data, 'Unexpected form data'
-            assert "license_reviewed" not in data, 'Unexpected form data'
-            data['owner'] = self.user
-            data['license_reviewed'] = False
-
         self.product = self.create_product(data)
         self.notifyCommercialMailingList()
         notify(ObjectCreatedEvent(self.product))

=== modified file 'lib/lp/registry/browser/tests/project-add-views.txt'
--- lib/lp/registry/browser/tests/project-add-views.txt	2010-05-12 19:06:17 +0000
+++ lib/lp/registry/browser/tests/project-add-views.txt	2010-05-25 04:43:25 +0000
@@ -80,12 +80,6 @@
     >>> view.search_results_count
     0
 
-The second step's page also includes some special things if the user is in the
-vcs_imports celebrity.  Foo Bar is in this team.
-
-    >>> view.isVCSImport()
-    True
-
 The second step also has a iterator over all the search results, of which
 there are currently none.