Merge lp:~cjwatson/launchpad/fix-dsp-vocab-picker into lp:launchpad

[Colin Watson]

Customise the picker for DistributionSourcePackageVocabulary to make vocabulary requests in the context of the currently-selected distribution.

Customise the picker for DistributionSourcePackageVocabulary to make vocabulary requests in the context of the currently-selected distribution. Otherwise the vocabulary only works if explicitly given the <distro>/<package> search format, which isn't very user-friendly.

I've also changed the vocabulary itself to return just the package name as the term's token and title, rather than distribution/package. This is less strictly correct, but given that it's always being fed into a package name text box it works a lot better in practice (we don't want that text box to receive e.g. "ubuntu/firefox"), and since the vocabulary always has its distribution context set from somewhere else it works fine in practice.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/app/javascript/picker/picker_patcher.js'
--- lib/lp/app/javascript/picker/picker_patcher.js	2012-09-07 14:42:48 +0000
+++ lib/lp/app/javascript/picker/picker_patcher.js	2016-07-27 17:22:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2011 Canonical Ltd.  This software is licensed under the
+/* Copyright 2011-2016 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  */
 
@@ -620,7 +620,9 @@
             // use the context to limit the results to the same project.
 
             var uri = '';
-            if (Y.Lang.isValue(config.context)){
+            if (Y.Lang.isFunction(config.getContextPath)) {
+                uri += config.getContextPath() + '/';
+            } else if (Y.Lang.isValue(config.context)) {
                 uri += Y.lp.get_url_path(
                     config.context.get('web_link')) + '/';
             }
 
=== modified file 'lib/lp/app/javascript/picker/tests/test_picker_patcher.js'
--- lib/lp/app/javascript/picker/tests/test_picker_patcher.js	2013-03-20 03:41:40 +0000
+++ lib/lp/app/javascript/picker/tests/test_picker_patcher.js	2016-07-27 17:22:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2012 Canonical Ltd.  This software is licensed under the
+/* Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE). */
 
 YUI.add('lp.app.picker.test', function (Y) {
@@ -33,7 +33,7 @@
     }
 
     tests.suite.add(new Y.Test.Case({
-        name: 'picker_yesyno_validation',
+        name: 'picker_yesno_validation',
 
         setUp: function() {
             this.vocabulary = [
@@ -514,6 +514,39 @@
 
     tests.suite.add(new Y.Test.Case({
 
+        name: 'picker_custom_context_path',
+
+        create_picker: function(yio, extra_config) {
+            var config = {yio: yio};
+            if (extra_config !== undefined) {
+                config = Y.merge(extra_config, config);
+            }
+            return Y.lp.app.picker.addPickerPatcher(
+                "Foo",
+                "foo/bar",
+                "test_link",
+                "picker_id",
+                config);
+        },
+
+        test_custom_context_path_honoured: function() {
+            var mock_io = new Y.lp.testing.mockio.MockIo();
+            var extra_config = {
+                "getContextPath": function() { return "/gentoo"; }
+            };
+            var picker = this.create_picker(mock_io, extra_config);
+            picker.fire('search', 'package');
+            Assert.areEqual(1, mock_io.requests.length);
+            Assert.areEqual(
+                '/gentoo/@@+huge-vocabulary?name=Foo&search_text=package&' +
+                'batch=6&start=0', mock_io.requests[0].url);
+            cleanup_widget(picker);
+        }
+
+    }));
+
+    tests.suite.add(new Y.Test.Case({
+
         name: 'picker_error_handling',
 
         setUp: function() {
 
=== modified file 'lib/lp/app/widgets/popup.py'
--- lib/lp/app/widgets/popup.py	2013-04-10 08:01:20 +0000
+++ lib/lp/app/widgets/popup.py	2016-07-27 17:22:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Single selection widget using a popup to select one item from many."""
@@ -275,3 +275,16 @@
                 "looking for? "
                 '<a href="%s/+affects-new-product">Register it</a>.</strong>'
                 % canonical_url(self.context.context))
+
+
+class DistributionSourcePackagePickerWidget(VocabularyPickerWidget):
+    """Custom popup widget for choosing distribution/package combinations."""
+
+    __call__ = ViewPageTemplateFile(
+        'templates/distributionsourcepackage-picker.pt')
+
+    @property
+    def distribution_id(self):
+        return self._prefix + 'distribution'
+
+    distribution_name = ''
 
=== added file 'lib/lp/app/widgets/templates/distributionsourcepackage-picker.pt'
--- lib/lp/app/widgets/templates/distributionsourcepackage-picker.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/app/widgets/templates/distributionsourcepackage-picker.pt	2016-07-27 17:22:45 +0000
@@ -0,0 +1,29 @@
+<tal:root
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    omit-tag="">
+
+<metal:form-picker use-macro="context/@@form-picker-macros/form-picker">
+  <script metal:fill-slot="add-picker" tal:content="structure string:
+  LPJS.use('node', 'lp.app.picker', function(Y) {
+      var config = ${view/json_config};
+      var distribution_name = '${view/distribution_name}';
+      var distribution_id = '${view/distribution_id}';
+      if (distribution_name !== '') {
+          config.getContextPath = function() {
+              return '/' + distribution_name;
+          }
+      } else if (distribution_id !== '') {
+          config.getContextPath = function() {
+              return '/' + Y.DOM.byId(distribution_id).value;
+          };
+      }
+      var show_widget_id = '${view/show_widget_id}';
+      Y.on('domready', function(e) {
+          Y.lp.app.picker.addPicker(config, show_widget_id);
+      });
+  });
+  "/>
+</metal:form-picker>
+
+</tal:root>
 
=== modified file 'lib/lp/app/widgets/templates/form-picker-macros.pt'
--- lib/lp/app/widgets/templates/form-picker-macros.pt	2012-02-01 23:47:54 +0000
+++ lib/lp/app/widgets/templates/form-picker-macros.pt	2016-07-27 17:22:45 +0000
@@ -29,7 +29,7 @@
     </tal:search_results>
 
     <tal:chooseLink replace="structure view/chooseLink" />
-    <script tal:content="structure string:
+    <script metal:define-slot="add-picker" tal:content="structure string:
     LPJS.use('node', 'lp.app.picker', function(Y) {
         var config = ${view/json_config};
         var show_widget_id = '${view/show_widget_id}';
 
=== modified file 'lib/lp/app/widgets/tests/test_launchpadtarget.py'
--- lib/lp/app/widgets/tests/test_launchpadtarget.py	2016-07-11 22:35:59 +0000
+++ lib/lp/app/widgets/tests/test_launchpadtarget.py	2016-07-27 17:22:45 +0000
@@ -82,7 +82,7 @@
         # The render template is setup.
         self.assertTrue(
             self.widget.template.filename.endswith('launchpad-target.pt'),
-            'Template was not setup.')
+            'Template was not set up.')
 
     def test_default_option(self):
         # This package field is the default option.
@@ -198,20 +198,10 @@
         self.widget.request = LaunchpadTestRequest(form=self.form)
         self.assertEqual(self.package, self.widget.getInputValue())
 
-    def test_getInputValue_package_spn_dsp_picker_feature_flag(self):
-        # The field value is the package when the package radio button
-        # is selected and the package sub field has a official dsp.
-        self.widget.request = LaunchpadTestRequest(form=self.form)
-        with FeatureFixture({u"disclosure.dsp_picker.enabled": u"on"}):
-            self.widget.setUpSubWidgets()
-            self.assertEqual(self.package, self.widget.getInputValue())
-
     def test_getInputValue_package_dsp_dsp_picker_feature_flag(self):
         # The field value is the package when the package radio button
         # is selected and the package sub field has valid input.
-        form = self.form
-        form['field.target.package'] = 'fnord/snarf'
-        self.widget.request = LaunchpadTestRequest(form=form)
+        self.widget.request = LaunchpadTestRequest(form=self.form)
         with FeatureFixture({u"disclosure.dsp_picker.enabled": u"on"}):
             self.widget.setUpSubWidgets()
             self.assertEqual(self.package, self.widget.getInputValue())
 
=== modified file 'lib/lp/app/widgets/tests/test_popup.py'
--- lib/lp/app/widgets/tests/test_popup.py	2012-08-28 04:35:13 +0000
+++ lib/lp/app/widgets/tests/test_popup.py	2016-07-27 17:22:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -10,6 +10,7 @@
 from zope.schema.vocabulary import getVocabularyRegistry
 
 from lp.app.widgets.popup import (
+    DistributionSourcePackagePickerWidget,
     PersonPickerWidget,
     VocabularyPickerWidget,
     )
@@ -23,12 +24,11 @@
     def __init__(self, name, bases=(), attrs=None, __doc__=None,
                  __module__=None):
         attrs = {
-            "test_invalid_chars+":
-            Choice(vocabulary='ValidTeamOwner'),
-            "test_valid.item":
-            Choice(vocabulary='ValidTeamOwner'),
-            "test_filtered.item":
-            Choice(vocabulary='DistributionOrProduct')}
+            "test_invalid_chars+": Choice(vocabulary='ValidTeamOwner'),
+            "test_valid.item": Choice(vocabulary='ValidTeamOwner'),
+            "test_filtered.item": Choice(vocabulary='DistributionOrProduct'),
+            "test_target": Choice(vocabulary='DistributionSourcePackage'),
+            }
         super(TestMetaClass, self).__init__(
             name, bases=bases, attrs=attrs, __doc__=__doc__,
             __module__=__module__)
@@ -197,3 +197,29 @@
         person_picker_widget.setRenderedValue(team)
         self.assertEqual('team',
             person_picker_widget.config['selected_value_metadata'])
+
+    def test_distribution_source_package_widget_distribution_id(self):
+        # The distribution source package picker refers to the correct field
+        # in distribution_id.
+        field = ITest['test_target']
+        bound_field = field.bind(self.context)
+        vocabulary = self.vocabulary_registry.get(
+            self.context, 'DistributionSourcePackage')
+        dsp_picker_widget = DistributionSourcePackagePickerWidget(
+            bound_field, vocabulary, self.request)
+        dsp_picker_widget.setPrefix('field.target')
+        self.assertEqual(
+            'field.target.distribution', dsp_picker_widget.distribution_id)
+
+    def test_distribution_source_package_widget_gets_distribution(self):
+        # The distribution source package picker gets the value of the
+        # distribution field.
+        field = ITest['test_target']
+        bound_field = field.bind(self.context)
+        vocabulary = self.vocabulary_registry.get(
+            self.context, 'DistributionSourcePackage')
+        dsp_picker_widget = DistributionSourcePackagePickerWidget(
+            bound_field, vocabulary, self.request)
+        dsp_picker_widget.setPrefix('field.target')
+        markup = dsp_picker_widget()
+        self.assertIn("distribution_id = 'field.target.distribution'", markup)
 
=== modified file 'lib/lp/bugs/browser/tests/test_bugalsoaffects.py'
--- lib/lp/bugs/browser/tests/test_bugalsoaffects.py	2016-07-11 22:35:59 +0000
+++ lib/lp/bugs/browser/tests/test_bugalsoaffects.py	2016-07-27 17:22:45 +0000
@@ -54,24 +54,7 @@
             browser = self.openBugPage(bug)
             browser.getLink(url='+distrotask').click()
             browser.getControl('Distribution').value = [self.distribution.name]
-            browser.getControl('Source Package Name').value = (
-                dsp.sourcepackagename.name)
-            browser.getControl('Continue').click()
-        self.assertEqual([], get_feedback_messages(browser.contents))
-
-    def test_bug_alsoaffects_dsp_exists_dsp_picker_feature_flag(self):
-        # If the distribution source package is official, there is no error.
-        bug = self.factory.makeBug()
-        distroseries = self.factory.makeDistroSeries(
-            distribution=self.distribution)
-        dsp = self.factory.makeDSPCache(
-            distroseries=distroseries, sourcepackagename='snarf')
-        with FeatureFixture({u"disclosure.dsp_picker.enabled": u"on"}):
-            browser = self.openBugPage(bug)
-            browser.getLink(url='+distrotask').click()
-            browser.getControl('Distribution').value = [self.distribution.name]
-            browser.getControl('Source Package Name').value = (
-                '%s/%s' % (self.distribution.name, dsp.name))
+            browser.getControl('Source Package Name').value = dsp.name
             browser.getControl('Continue').click()
         self.assertEqual([], get_feedback_messages(browser.contents))
 
 
=== modified file 'lib/lp/bugs/browser/widgets/bugtask.py'
--- lib/lp/bugs/browser/widgets/bugtask.py	2016-06-10 22:06:13 +0000
+++ lib/lp/bugs/browser/widgets/bugtask.py	2016-07-27 17:22:45 +0000
@@ -53,8 +53,8 @@
 from lp.app.widgets.helpers import get_widget_template
 from lp.app.widgets.launchpadtarget import LaunchpadTargetWidget
 from lp.app.widgets.popup import (
+    DistributionSourcePackagePickerWidget,
     PersonPickerWidget,
-    VocabularyPickerWidget,
     )
 from lp.app.widgets.textwidgets import (
     StrippedTextWidget,
@@ -478,12 +478,17 @@
         return vocabulary
 
 
-class BugTaskSourcePackageNameWidget(VocabularyPickerWidget):
+class BugTaskSourcePackageNameWidget(DistributionSourcePackagePickerWidget):
     """A widget for associating a bugtask with a SourcePackageName.
 
     It accepts both binary and source package names.
     """
 
+    # Pages that use this widget don't display the distribution, but this
+    # can only be used by bugtasks on the distribution in question so the
+    # vocabulary will be able to work it out for itself.
+    distribution_id = ''
+
     def __init__(self, field, vocabulary, request):
         super(BugTaskSourcePackageNameWidget, self).__init__(
             field, vocabulary, request)
@@ -542,6 +547,8 @@
     except that it gets the distribution from the request.
     """
 
+    distribution_id = 'field.distribution'
+
     def getDistribution(self):
         """See `BugTaskSourcePackageNameWidget`"""
         distribution_name = self.request.form.get('field.distribution')
@@ -559,6 +566,8 @@
 class UbuntuSourcePackageNameWidget(BugTaskSourcePackageNameWidget):
     """A widget to select Ubuntu packages."""
 
+    distribution_name = 'ubuntu'
+
     def getDistribution(self):
         """See `BugTaskSourcePackageNameWidget`"""
         return getUtility(ILaunchpadCelebrities).ubuntu
 
=== modified file 'lib/lp/registry/tests/test_distributionsourcepackage_vocabulary.py'
--- lib/lp/registry/tests/test_distributionsourcepackage_vocabulary.py	2016-07-11 22:35:59 +0000
+++ lib/lp/registry/tests/test_distributionsourcepackage_vocabulary.py	2016-07-27 17:22:45 +0000
@@ -69,52 +69,24 @@
         vocabulary.setDistribution(new_distro)
         self.assertEqual(new_distro, vocabulary.distribution)
 
-    def test_parseToken_distro_and_package(self):
-        # parseToken returns a tuple of distribution and package name when
-        # the text contains both.
-        new_distro = self.factory.makeDistribution(name='fnord')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        distribution, package_name = vocabulary.parseToken('fnord/pting')
-        self.assertEqual(new_distro, distribution)
-        self.assertEqual('pting', package_name)
-
-    def test_parseToken_default_distro_and_package(self):
-        # parseToken returns a tuple of the default distribution and package
-        # name when the text is just a package name.
-        default_distro = self.factory.makeDistribution(name='fnord')
-        vocabulary = DistributionSourcePackageVocabulary(default_distro)
-        distribution, package_name = vocabulary.parseToken('pting')
-        self.assertEqual(default_distro, distribution)
-        self.assertEqual('pting', package_name)
-
-    def test_parseToken_bad_distro_and_package(self):
-        # parseToken returns a tuple of the default distribution and package
-        # name when the distro in the text cannot be matched to a real
-        # distro.
-        default_distro = self.factory.makeDistribution(name='fnord')
-        vocabulary = DistributionSourcePackageVocabulary(default_distro)
-        distribution, package_name = vocabulary.parseToken('misspelled/pting')
-        self.assertEqual(default_distro, distribution)
-        self.assertEqual('pting', package_name)
-
-    def test_contains_true_without_init(self):
+    def test_contains_true_with_distribution(self):
         # The vocabulary contains official DSPs.
         dsp = self.factory.makeDistributionSourcePackage(with_db=True)
-        vocabulary = DistributionSourcePackageVocabulary(None)
+        vocabulary = DistributionSourcePackageVocabulary(dsp.distribution)
         self.assertIn(dsp, vocabulary)
 
-    def test_contains_true_with_init(self):
+    def test_contains_true_with_dsp(self):
         # The vocabulary contains the DSP passed to init when it is not
         # official.
         dsp = self.factory.makeDistributionSourcePackage(with_db=False)
         vocabulary = DistributionSourcePackageVocabulary(dsp)
         self.assertIn(dsp, vocabulary)
 
-    def test_contains_false_without_init(self):
+    def test_contains_false_with_distribution(self):
         # The vocabulary does not contain DSPs that are not official that
         # were not passed to init.
         dsp = self.factory.makeDistributionSourcePackage(with_db=False)
-        vocabulary = DistributionSourcePackageVocabulary(None)
+        vocabulary = DistributionSourcePackageVocabulary(dsp.distribution)
         self.assertNotIn(dsp, vocabulary)
 
     def test_toTerm_raises_error(self):
@@ -123,11 +95,12 @@
         dsp = self.factory.makeDistributionSourcePackage(
             sourcepackagename='foo')
         vocabulary = DistributionSourcePackageVocabulary(dsp.distribution)
-        self.assertRaises(LookupError, vocabulary.toTerm, dsp.name)
+        self.assertRaises(LookupError, vocabulary.toTerm, dsp)
 
     def test_toTerm_none_raises_error(self):
         # An error is raised for an SPN that does not exist.
-        vocabulary = DistributionSourcePackageVocabulary(None)
+        vocabulary = DistributionSourcePackageVocabulary(
+            self.factory.makeDistribution())
         self.assertRaises(LookupError, vocabulary.toTerm, 'nonexistent')
 
     def test_toTerm_spn_and_default_distribution(self):
@@ -137,21 +110,8 @@
             spph.sourcepackagerelease.sourcepackagename)
         vocabulary = DistributionSourcePackageVocabulary(dsp.distribution)
         term = vocabulary.toTerm(dsp.sourcepackagename)
-        expected_token = '%s/%s' % (dsp.distribution.name, dsp.name)
-        self.assertEqual(expected_token, term.token)
-        self.assertEqual(expected_token, term.title)
-        self.assertEqual(dsp, term.value)
-
-    def test_toTerm_spn_and_distribution(self):
-        # The distribution is used with the spn if it is passed.
-        spph = self.factory.makeSourcePackagePublishingHistory()
-        dsp = spph.distroseries.distribution.getSourcePackage(
-            spph.sourcepackagerelease.sourcepackagename)
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        term = vocabulary.toTerm(dsp.sourcepackagename, dsp.distribution)
-        expected_token = '%s/%s' % (dsp.distribution.name, dsp.name)
-        self.assertEqual(expected_token, term.token)
-        self.assertEqual(expected_token, term.title)
+        self.assertEqual(dsp.name, term.token)
+        self.assertEqual(dsp.name, term.title)
         self.assertEqual(dsp, term.value)
 
     def test_toTerm_dsp(self):
@@ -161,9 +121,8 @@
             spph.sourcepackagerelease.sourcepackagename)
         vocabulary = DistributionSourcePackageVocabulary(dsp)
         term = vocabulary.toTerm(dsp)
-        expected_token = '%s/%s' % (dsp.distribution.name, dsp.name)
-        self.assertEqual(expected_token, term.token)
-        self.assertEqual(expected_token, term.title)
+        self.assertEqual(dsp.name, term.token)
+        self.assertEqual(dsp.name, term.title)
         self.assertEqual(dsp, term.value)
 
     def test_toTerm_dsp_and_binary_names(self):
@@ -174,9 +133,8 @@
             spph.sourcepackagerelease.sourcepackagename)
         vocabulary = DistributionSourcePackageVocabulary(dsp)
         term = vocabulary.toTerm((dsp, 'one two'))
-        expected_token = '%s/%s' % (dsp.distribution.name, dsp.name)
-        self.assertEqual(expected_token, term.token)
-        self.assertEqual(expected_token, term.title)
+        self.assertEqual(dsp.name, term.token)
+        self.assertEqual(dsp.name, term.title)
         self.assertEqual(dsp, term.value)
         self.assertEqual(['one', 'two'], term.value.binary_names)
 
@@ -185,8 +143,7 @@
         dsp = self.factory.makeDistributionSourcePackage(
             sourcepackagename='foo')
         vocabulary = DistributionSourcePackageVocabulary(dsp.distribution)
-        token = '%s/%s' % (dsp.distribution.name, dsp.name)
-        self.assertRaises(LookupError, vocabulary.getTermByToken, token)
+        self.assertRaises(LookupError, vocabulary.getTermByToken, dsp.name)
 
     def test_getTermByToken_token(self):
         # The term is returned if it matches an official DSP.
@@ -194,20 +151,16 @@
         dsp = spph.distroseries.distribution.getSourcePackage(
             spph.sourcepackagerelease.sourcepackagename)
         vocabulary = DistributionSourcePackageVocabulary(dsp.distribution)
-        token = '%s/%s' % (dsp.distribution.name, dsp.name)
-        term = vocabulary.getTermByToken(token)
+        term = vocabulary.getTermByToken(dsp.name)
         self.assertEqual(dsp, term.value)
 
     def test_searchForTerms_without_distribution(self):
-        # An empty result set is returned if the vocabulary has no
-        # distribution and the search does not provide distribution
-        # information.
+        # searchForTerms asserts that the vocabulary has a distribution.
         spph = self.factory.makeSourcePackagePublishingHistory()
         dsp = spph.distroseries.distribution.getSourcePackage(
             spph.sourcepackagerelease.sourcepackagename)
         vocabulary = DistributionSourcePackageVocabulary(dsp.name)
-        results = vocabulary.searchForTerms(dsp.name)
-        self.assertEqual(0, results.count())
+        self.assertRaises(AssertionError, vocabulary.searchForTerms, dsp.name)
 
     def test_searchForTerms_None(self):
         # Searching for nothing gets you that.
@@ -222,11 +175,11 @@
         distroseries = self.factory.makeDistroSeries(distribution=distro)
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='snarf')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/snarf')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='snarf')
         terms = list(results)
         self.assertEqual(1, len(terms))
-        self.assertEqual('fnord/snarf', terms[0].token)
+        self.assertEqual('snarf', terms[0].token)
 
     def test_searchForTerms_similar_official_source_name(self):
         # Partial source name matches are found.
@@ -234,11 +187,11 @@
         distroseries = self.factory.makeDistroSeries(distribution=distro)
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='pting-snarf-ack')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/snarf')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='snarf')
         terms = list(results)
         self.assertEqual(1, len(terms))
-        self.assertEqual('fnord/pting-snarf-ack', terms[0].token)
+        self.assertEqual('pting-snarf-ack', terms[0].token)
 
     def test_searchForTerms_exact_binary_name(self):
         # Exact binary name matches are found.
@@ -247,11 +200,11 @@
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='snarf',
             binary_names='pting-dev pting ack')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/pting')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='pting')
         terms = list(results)
         self.assertEqual(1, len(terms))
-        self.assertEqual('fnord/snarf', terms[0].token)
+        self.assertEqual('snarf', terms[0].token)
 
     def test_searchForTerms_similar_binary_name(self):
         # Partial binary name matches are found.
@@ -260,11 +213,11 @@
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='snarf',
             binary_names='thrpp pting-dev ack')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/pting')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='pting')
         terms = list(results)
         self.assertEqual(1, len(terms))
-        self.assertEqual('fnord/snarf', terms[0].token)
+        self.assertEqual('snarf', terms[0].token)
 
     def test_searchForTerms_exact_unofficial_source_name(self):
         # Unofficial source packages are not found by search.
@@ -273,8 +226,8 @@
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='snarf',
             official=False)
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/snarf')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='snarf')
         terms = list(results)
         self.assertEqual(0, len(terms))
 
@@ -285,8 +238,8 @@
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='snarf',
             official=False, binary_names='thrpp pting ack')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/pting')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='pting')
         terms = list(results)
         self.assertEqual(0, len(terms))
 
@@ -304,14 +257,14 @@
         self.factory.makeDSPCache(
             distroseries=distroseries, sourcepackagename='pting-client',
             binary_names='snarf-common')
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/snarf')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='snarf')
         terms = list(results)
         self.assertEqual(4, len(terms))
-        self.assertEqual('fnord/snarf', terms[0].token)
-        self.assertEqual('fnord/pting-devel', terms[1].token)
-        self.assertEqual('fnord/snarf-server', terms[2].token)
-        self.assertEqual('fnord/pting-client', terms[3].token)
+        self.assertEqual('snarf', terms[0].token)
+        self.assertEqual('pting-devel', terms[1].token)
+        self.assertEqual('snarf-server', terms[2].token)
+        self.assertEqual('pting-client', terms[3].token)
 
     def test_searchForTerms_partner_archive(self):
         # Packages in partner archives are searched.
@@ -321,11 +274,11 @@
             distroseries=distroseries, sourcepackagename='snarf',
             archive=self.factory.makeArchive(
                 distribution=distro, purpose=ArchivePurpose.PARTNER))
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/snarf')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='snarf')
         terms = list(results)
         self.assertEqual(1, len(terms))
-        self.assertEqual('fnord/snarf', terms[0].token)
+        self.assertEqual('snarf', terms[0].token)
 
     def test_searchForTerms_ppa_archive(self):
         # Packages in PPAs are ignored.
@@ -336,6 +289,6 @@
             official=False,
             archive=self.factory.makeArchive(
                 distribution=distro, purpose=ArchivePurpose.PPA))
-        vocabulary = DistributionSourcePackageVocabulary(None)
-        results = vocabulary.searchForTerms(query='fnord/snarf')
+        vocabulary = DistributionSourcePackageVocabulary(distro)
+        results = vocabulary.searchForTerms(query='snarf')
         self.assertEqual(0, results.count())
 
=== modified file 'lib/lp/registry/vocabularies.py'
--- lib/lp/registry/vocabularies.py	2016-07-11 21:46:03 +0000
+++ lib/lp/registry/vocabularies.py	2016-07-27 17:22:45 +0000
@@ -111,10 +111,7 @@
     PersonVisibility,
     )
 from lp.registry.interfaces.accesspolicy import IAccessPolicySource
-from lp.registry.interfaces.distribution import (
-    IDistribution,
-    IDistributionSet,
-    )
+from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage,
     )
@@ -2028,7 +2025,7 @@
 class DistributionSourcePackageVocabulary(FilteredVocabularyBase):
 
     displayname = 'Select a package'
-    step_title = 'Search by name or distro/name'
+    step_title = 'Search by name'
 
     def __init__(self, context):
         self.context = context
@@ -2068,19 +2065,15 @@
         """Set the distribution after the vocabulary was instantiated."""
         self.distribution = distribution
 
-    def parseToken(self, text):
-        """Return the distribution and package name from the parsed token."""
-        # Match the toTerm() format, but also use it to select a distribution.
-        distribution = None
-        if '/' in text:
-            distro_name, text = text.split('/', 1)
-            distribution = getUtility(IDistributionSet).getByName(distro_name)
-        if distribution is None:
-            distribution = self.distribution
-        return distribution, text
+    def _assertHasDistribution(self):
+        if self.distribution is None:
+            raise AssertionError(
+                "DistributionSourcePackageVocabulary cannot be used without "
+                "setting a distribution.")
 
-    def toTerm(self, spn_or_dsp, distribution=None):
+    def toTerm(self, spn_or_dsp):
         """See `IVocabulary`."""
+        self._assertHasDistribution()
         dsp = None
         binary_names = None
         if isinstance(spn_or_dsp, tuple):
@@ -2088,21 +2081,27 @@
             spn_or_dsp, binary_names = spn_or_dsp
             if binary_names is not None:
                 binary_names = binary_names.split()
+        # XXX cjwatson 2016-07-27: Eventually this should just take a DSP
+        # and drop the complication of also accepting SPNs; but, for now,
+        # accepting an SPN reduces the amount of feature-flag checks
+        # required by users of this vocabulary.
         if IDistributionSourcePackage.providedBy(spn_or_dsp):
             dsp = spn_or_dsp
-            distribution = spn_or_dsp.distribution
-        else:
-            distribution = distribution or self.distribution
-            if distribution is not None and spn_or_dsp is not None:
-                dsp = distribution.getSourcePackage(spn_or_dsp)
+        elif spn_or_dsp is not None:
+            dsp = self.distribution.getSourcePackage(spn_or_dsp)
         if dsp is not None and (dsp == self.dsp or dsp.is_official):
             if binary_names:
                 # Search already did the hard work of looking up binary names.
                 cache = get_property_cache(dsp)
                 cache.binary_names = binary_names
-            token = '%s/%s' % (dsp.distribution.name, dsp.name)
-            return SimpleTerm(dsp, token, token)
-        raise LookupError(distribution, spn_or_dsp)
+            # XXX cjwatson 2016-07-22: It's a bit odd for the token to
+            # return just the source package name and not the distribution
+            # name as well, but at the moment this is always fed into a
+            # package name box so things work much better this way.  If we
+            # ever do a true combined distribution/package picker, then this
+            # may need to be revisited.
+            return SimpleTerm(dsp, dsp.name, dsp.name)
+        raise LookupError(self.distribution, spn_or_dsp)
 
     def getTerm(self, spn_or_dsp):
         """See `IBaseVocabulary`."""
@@ -2110,19 +2109,13 @@
 
     def getTermByToken(self, token):
         """See `IVocabularyTokenized`."""
-        distribution, package_name = self.parseToken(token)
-        return self.toTerm(package_name, distribution)
+        return self.toTerm(token)
 
     def searchForTerms(self, query=None, vocab_filter=None):
         """See `IHugeVocabulary`."""
+        self._assertHasDistribution()
         if not query:
             return EmptyResultSet()
-        distribution, query = self.parseToken(query)
-        if distribution is None:
-            # This could failover to ubuntu, but that is non-obvious. The
-            # Python widget must set the default distribution and the JS
-            # widget must encourage the <distro>/<package> search format.
-            return EmptyResultSet()
 
         query = unicode(query)
         query_re = re.escape(query)
@@ -2143,9 +2136,10 @@
                     ),
                 Or(
                     DistributionSourcePackageCache.archiveID.is_in(
-                        distribution.all_distro_archive_ids),
+                        self.distribution.all_distro_archive_ids),
                     DistributionSourcePackageCache.archive == None),
-                DistributionSourcePackageCache.distribution == distribution,
+                DistributionSourcePackageCache.distribution ==
+                    self.distribution,
                 ),
             tables=DistributionSourcePackageCache))
         SearchableDSPC = Table("SearchableDSPC")
@@ -2178,7 +2172,7 @@
                 (DistributionSourcePackageInDatabase,
                  searchable_dspc_binpkgnames),
                 DistributionSourcePackageInDatabase.distribution ==
-                    distribution,
+                    self.distribution,
                 DistributionSourcePackageInDatabase.sourcepackagename_id ==
                     searchable_dspc_sourcepackagename)
         results.order_by(Desc(rank), searchable_dspc_name)
 
=== modified file 'lib/lp/services/webapp/configure.zcml'
--- lib/lp/services/webapp/configure.zcml	2014-11-28 22:07:05 +0000
+++ lib/lp/services/webapp/configure.zcml	2016-07-27 17:22:45 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+<!-- Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
      GNU Affero General Public License version 3 (see the file LICENSE).
 -->
 
@@ -413,6 +413,17 @@
       permission="zope.Public"
       />
 
+    <!-- Define the widget used by fields that use
+         DistributionSourcePackageVocabulary. -->
+    <view
+      type="zope.publisher.interfaces.browser.IBrowserRequest"
+      for="zope.schema.interfaces.IChoice
+        lp.registry.vocabularies.DistributionSourcePackageVocabulary"
+      provides="zope.formlib.interfaces.IInputWidget"
+      factory="lp.app.widgets.popup.DistributionSourcePackagePickerWidget"
+      permission="zope.Public"
+      />
+
     <!-- A simple view used by the page tests. -->
     <browser:page
         for="lp.services.webapp.interfaces.ILaunchpadRoot"