Merge ~cjwatson/launchpad:stormify-sourcepackagename into launchpad:master

[Colin Watson]

Convert SourcePackageName to Storm

`SourcePackageName.potemplates` and `SourcePackageName.packagings` were unused, so I removed them.

[Ines Almeida (ines-almeida)]

LGTM

We do seem to want to query SourcePackageNames by name a lot, would it make sense to create a small class method for that (something similar to what `byName` did)? I don't think that's a deal breaker though, the changes look good

review: Approve

7dd6fa6... by Colin Watson on 2023-08-31

Remove potemplates and packagings from interface too

f5b65d8... by Colin Watson on 2023-08-31

Use set interfaces for xPN lookups

[Colin Watson (cjwatson)]

I switched to `getUtility(ISourcePackageNameSet)[name]` or `getUtility(ISourcePackageNameSet).queryByName(name)` where appropriate (and similarly for binary package names) - the fact that those return security-proxied instances doesn't seem to be a problem here. Thanks for the suggestion.

diff --git a/lib/lp/archiveuploader/tests/test_uploadprocessor.py b/lib/lp/archiveuploader/tests/test_uploadprocessor.py
index de16e04..95c1b8b 100644
--- a/lib/lp/archiveuploader/tests/test_uploadprocessor.py
+++ b/lib/lp/archiveuploader/tests/test_uploadprocessor.py
@@ -51,7 +51,6 @@ from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.sourcepackage import SourcePackageFileType
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
-from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.services.config import config
 from lp.services.database.constants import UTC_NOW
 from lp.services.database.interfaces import IStore
@@ -68,6 +67,7 @@ from lp.soyuz.enums import (
 from lp.soyuz.interfaces.archive import IArchiveSet
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
+from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.livefs import LIVEFS_FEATURE_FLAG
 from lp.soyuz.interfaces.packageset import IPackagesetSet
@@ -80,7 +80,6 @@ from lp.soyuz.interfaces.sourcepackageformat import (
     ISourcePackageFormatSelectionSet,
 )
 from lp.soyuz.model.archivepermission import ArchivePermission
-from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.soyuz.model.publishing import (
     BinaryPackagePublishingHistory,
@@ -1096,7 +1095,7 @@ class TestUploadProcessor(StatsMixin, TestUploadProcessorBase):
         self._checkPartnerUploadEmailSuccess()
 
         # Find the sourcepackagerelease and check its component.
-        foocomm_name = SourcePackageName.selectOneBy(name="foocomm")
+        foocomm_name = getUtility(ISourcePackageNameSet)["foocomm"]
         foocomm_spr = (
             IStore(SourcePackageRelease)
             .find(SourcePackageRelease, sourcepackagename=foocomm_name)
@@ -1162,11 +1161,7 @@ class TestUploadProcessor(StatsMixin, TestUploadProcessorBase):
         self.processUpload(uploadprocessor, upload_dir)
 
         # Find the binarypackagerelease and check its component.
-        foocomm_binname = (
-            IStore(BinaryPackageName)
-            .find(BinaryPackageName, name="foocomm")
-            .one()
-        )
+        foocomm_binname = getUtility(IBinaryPackageNameSet)["foocomm"]
         foocomm_bpr = (
             IStore(BinaryPackageRelease)
             .find(BinaryPackageRelease, binarypackagename=foocomm_binname)
diff --git a/lib/lp/registry/doc/distribution.rst b/lib/lp/registry/doc/distribution.rst
index e618751..6ebdb59 100644
--- a/lib/lp/registry/doc/distribution.rst
+++ b/lib/lp/registry/doc/distribution.rst
@@ -73,15 +73,17 @@ Let's make sure a distribution object properly implements its interfaces.
 Once you've got a distribution, you can retrieve a source package if you
 have a SourcePackageName object for it.
 
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
     >>> from lp.registry.interfaces.distributionsourcepackage import (
     ...     IDistributionSourcePackage,
     ... )
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
     >>> from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     ...     IDistributionSourcePackageRelease,
     ... )
 
-    >>> evo = SourcePackageName.byName("evolution")
+    >>> evo = getUtility(ISourcePackageNameSet)["evolution"]
     >>> evo_ubuntu = ubuntu.getSourcePackage(evo)
     >>> print(evo_ubuntu.name)
     evolution
diff --git a/lib/lp/registry/doc/sourcepackage.rst b/lib/lp/registry/doc/sourcepackage.rst
index 462d93f..ca27efe 100644
--- a/lib/lp/registry/doc/sourcepackage.rst
+++ b/lib/lp/registry/doc/sourcepackage.rst
@@ -274,9 +274,8 @@ packaging process. Here we test the code that links all of those.
 
 First, let's get some useful objects from the db.
 
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
-    >>> firefox = SourcePackageName.byName("mozilla-firefox")
-    >>> pmount = SourcePackageName.byName("pmount")
+    >>> firefox = sourcepackagenameset["mozilla-firefox"]
+    >>> pmount = sourcepackagenameset["pmount"]
 
     >>> from lp.registry.model.distroseries import DistroSeries
     >>> warty = DistroSeries.get(1)
diff --git a/lib/lp/registry/interfaces/sourcepackagename.py b/lib/lp/registry/interfaces/sourcepackagename.py
index 30c8b55..aabe44c 100644
--- a/lib/lp/registry/interfaces/sourcepackagename.py
+++ b/lib/lp/registry/interfaces/sourcepackagename.py
@@ -8,7 +8,7 @@ __all__ = [
     "ISourcePackageNameSet",
 ]
 
-from zope.interface import Attribute, Interface
+from zope.interface import Interface
 from zope.schema import Int, TextLine
 
 from lp import _
@@ -28,11 +28,6 @@ class ISourcePackageName(Interface):
         required=True,
         constraint=name_validator,
     )
-    potemplates = Attribute("The list of PO templates that this object has.")
-    packagings = Attribute(
-        "Everything we know about the packaging of "
-        "packages with this source package name."
-    )
 
     def __str__():
         """Return the name"""
diff --git a/lib/lp/registry/model/distribution.py b/lib/lp/registry/model/distribution.py
index 81040cb..8abb04f 100644
--- a/lib/lp/registry/model/distribution.py
+++ b/lib/lp/registry/model/distribution.py
@@ -124,7 +124,10 @@ from lp.registry.interfaces.pillar import IPillarNameSet
 from lp.registry.interfaces.pocket import suffixpocket
 from lp.registry.interfaces.role import IPersonRoles
 from lp.registry.interfaces.series import SeriesStatus
-from lp.registry.interfaces.sourcepackagename import ISourcePackageName
+from lp.registry.interfaces.sourcepackagename import (
+    ISourcePackageName,
+    ISourcePackageNameSet,
+)
 from lp.registry.model.accesspolicy import AccessPolicyGrantFlat
 from lp.registry.model.announcement import MakesAnnouncements
 from lp.registry.model.commercialsubscription import CommercialSubscription
@@ -155,12 +158,7 @@ from lp.services.database.decoratedresultset import DecoratedResultSet
 from lp.services.database.enumcol import DBEnum
 from lp.services.database.interfaces import IStore
 from lp.services.database.sqlbase import SQLBase, sqlvalues
-from lp.services.database.sqlobject import (
-    BoolCol,
-    ForeignKey,
-    SQLObjectNotFound,
-    StringCol,
-)
+from lp.services.database.sqlobject import BoolCol, ForeignKey, StringCol
 from lp.services.database.stormexpr import (
     ArrayAgg,
     ArrayIntersects,
@@ -183,10 +181,10 @@ from lp.soyuz.enums import (
 from lp.soyuz.interfaces.archive import MAIN_ARCHIVE_PURPOSES, IArchiveSet
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
+from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.publishing import active_publishing_status
 from lp.soyuz.model.archive import Archive
 from lp.soyuz.model.archivefile import ArchiveFile
-from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease,
 )
@@ -1358,9 +1356,10 @@ class Distribution(
         if ISourcePackageName.providedBy(name):
             sourcepackagename = name
         else:
-            try:
-                sourcepackagename = SourcePackageName.byName(name)
-            except SQLObjectNotFound:
+            sourcepackagename = getUtility(ISourcePackageNameSet).queryByName(
+                name
+            )
+            if sourcepackagename is None:
                 return None
         return DistributionSourcePackage(self, sourcepackagename)
 
@@ -1748,7 +1747,9 @@ class Distribution(
                 "published in it" % (self.displayname, pkgname)
             )
 
-        sourcepackagename = SourcePackageName.selectOneBy(name=pkgname)
+        sourcepackagename = getUtility(ISourcePackageNameSet).queryByName(
+            pkgname
+        )
         if sourcepackagename:
             # Note that in the source package case, we don't restrict
             # the search to the distribution release, making a best
@@ -1789,10 +1790,8 @@ class Distribution(
         # At this point we don't have a published source package by
         # that name, so let's try to find a binary package and work
         # back from there.
-        binarypackagename = (
-            IStore(BinaryPackageName)
-            .find(BinaryPackageName, name=pkgname)
-            .one()
+        binarypackagename = getUtility(IBinaryPackageNameSet).queryByName(
+            pkgname
         )
         if binarypackagename:
             # Ok, so we have a binarypackage with that name. Grab its
diff --git a/lib/lp/registry/model/distroseries.py b/lib/lp/registry/model/distroseries.py
index db6564b..2b43af8 100644
--- a/lib/lp/registry/model/distroseries.py
+++ b/lib/lp/registry/model/distroseries.py
@@ -56,7 +56,10 @@ from lp.registry.interfaces.person import validate_public_person
 from lp.registry.interfaces.pocket import PackagePublishingPocket, pocketsuffix
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.sourcepackage import ISourcePackageFactory
-from lp.registry.interfaces.sourcepackagename import ISourcePackageName
+from lp.registry.interfaces.sourcepackagename import (
+    ISourcePackageName,
+    ISourcePackageNameSet,
+)
 from lp.registry.model.milestone import HasMilestonesMixin, Milestone
 from lp.registry.model.packaging import Packaging
 from lp.registry.model.person import Person
@@ -73,7 +76,6 @@ from lp.services.database.sqlobject import (
     BoolCol,
     ForeignKey,
     IntCol,
-    SQLObjectNotFound,
     StringCol,
 )
 from lp.services.database.stormexpr import WithMaterialized, fti_search
@@ -89,7 +91,10 @@ from lp.soyuz.enums import (
     PackageUploadStatus,
 )
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
-from lp.soyuz.interfaces.binarypackagename import IBinaryPackageName
+from lp.soyuz.interfaces.binarypackagename import (
+    IBinaryPackageName,
+    IBinaryPackageNameSet,
+)
 from lp.soyuz.interfaces.distributionjob import (
     IInitializeDistroSeriesJobSource,
 )
@@ -1042,9 +1047,8 @@ class DistroSeries(
     def getSourcePackage(self, name):
         """See `IDistroSeries`."""
         if not ISourcePackageName.providedBy(name):
-            try:
-                name = SourcePackageName.byName(name)
-            except SQLObjectNotFound:
+            name = getUtility(ISourcePackageNameSet).queryByName(name)
+            if name is None:
                 return None
         return getUtility(ISourcePackageFactory).new(
             sourcepackagename=name, distroseries=self
@@ -1053,11 +1057,7 @@ class DistroSeries(
     def getBinaryPackage(self, name):
         """See `IDistroSeries`."""
         if not IBinaryPackageName.providedBy(name):
-            name = (
-                IStore(BinaryPackageName)
-                .find(BinaryPackageName, name=name)
-                .one()
-            )
+            name = getUtility(IBinaryPackageNameSet).queryByName(name)
             if name is None:
                 return None
         return DistroSeriesBinaryPackage(self, name)
diff --git a/lib/lp/registry/model/sourcepackage.py b/lib/lp/registry/model/sourcepackage.py
index 329e692..c15b371 100644
--- a/lib/lp/registry/model/sourcepackage.py
+++ b/lib/lp/registry/model/sourcepackage.py
@@ -666,7 +666,7 @@ class SourcePackage(
         SourcePackagePublishingHistory.archive = BinaryPackageBuild.archive
         """
             % sqlvalues(
-                self.sourcepackagename,
+                self.sourcepackagename.id,
                 self.distroseries,
                 list(self.distribution.all_distro_archive_ids),
             )
diff --git a/lib/lp/registry/model/sourcepackagename.py b/lib/lp/registry/model/sourcepackagename.py
index 37974b0..fbb3598 100644
--- a/lib/lp/registry/model/sourcepackagename.py
+++ b/lib/lp/registry/model/sourcepackagename.py
@@ -7,7 +7,7 @@ __all__ = [
     "getSourcePackageDescriptions",
 ]
 
-import six
+from storm.properties import Int, Unicode
 from zope.interface import implementer
 
 from lp.app.errors import NotFoundError
@@ -17,26 +17,21 @@ from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageName,
     ISourcePackageNameSet,
 )
-from lp.services.database.sqlbase import SQLBase, cursor, sqlvalues
-from lp.services.database.sqlobject import (
-    SQLMultipleJoin,
-    SQLObjectNotFound,
-    StringCol,
-)
+from lp.services.database.interfaces import IStore
+from lp.services.database.sqlbase import cursor, sqlvalues
+from lp.services.database.stormbase import StormBase
 
 
 @implementer(ISourcePackageName)
-class SourcePackageName(SQLBase):
-    _table = "SourcePackageName"
+class SourcePackageName(StormBase):
+    __storm_table__ = "SourcePackageName"
 
-    name = StringCol(
-        dbName="name", notNull=True, unique=True, alternateID=True
-    )
+    id = Int(primary=True)
+    name = Unicode(name="name", allow_none=False)
 
-    potemplates = SQLMultipleJoin("POTemplate", joinColumn="sourcepackagename")
-    packagings = SQLMultipleJoin(
-        "Packaging", joinColumn="sourcepackagename", orderBy="Packaging.id"
-    )
+    def __init__(self, name):
+        super().__init__()
+        self.name = name
 
     def __str__(self):
         return self.name
@@ -44,46 +39,52 @@ class SourcePackageName(SQLBase):
     def __repr__(self):
         return "<%s '%s'>" % (self.__class__.__name__, self.name)
 
+    @classmethod
     def ensure(klass, name):
-        try:
-            return klass.byName(name)
-        except SQLObjectNotFound:
-            return klass(name=name)
-
-    ensure = classmethod(ensure)
+        spn = IStore(klass).find(klass, name=name).one()
+        if spn is None:
+            spn = klass(name=name)
+        return spn
 
 
 @implementer(ISourcePackageNameSet)
 class SourcePackageNameSet:
     def __getitem__(self, name):
         """See `ISourcePackageNameSet`."""
-        name = six.ensure_text(name, "ASCII")
-        try:
-            return SourcePackageName.byName(name)
-        except SQLObjectNotFound:
+        spn = self.queryByName(name)
+        if spn is None:
             raise NoSuchSourcePackageName(name)
+        return spn
 
     def get(self, sourcepackagenameid):
         """See `ISourcePackageNameSet`."""
-        try:
-            return SourcePackageName.get(sourcepackagenameid)
-        except SQLObjectNotFound:
+        spn = IStore(SourcePackageName).get(
+            SourcePackageName, sourcepackagenameid
+        )
+        if spn is None:
             raise NotFoundError(sourcepackagenameid)
+        return spn
 
     def getAll(self):
         """See `ISourcePackageNameSet`."""
-        return SourcePackageName.select()
+        return IStore(SourcePackageName).find(SourcePackageName)
 
     def queryByName(self, name):
         """See `ISourcePackageNameSet`."""
-        return SourcePackageName.selectOneBy(name=name)
+        return (
+            IStore(SourcePackageName).find(SourcePackageName, name=name).one()
+        )
 
     def new(self, name):
         if not valid_name(name):
             raise InvalidName(
                 "%s is not a valid name for a source package." % name
             )
-        return SourcePackageName(name=name)
+        spn = SourcePackageName(name=name)
+        store = IStore(SourcePackageName)
+        store.add(spn)
+        store.flush()
+        return spn
 
     def getOrCreateByName(self, name):
         try:
diff --git a/lib/lp/registry/vocabularies.py b/lib/lp/registry/vocabularies.py
index e8932cd..955e975 100644
--- a/lib/lp/registry/vocabularies.py
+++ b/lib/lp/registry/vocabularies.py
@@ -2122,7 +2122,7 @@ class SourcePackageNameVocabulary(NamedStormHugeVocabulary):
         if not query:
             return self.emptySelectResults()
 
-        query = six.ensure_text(query).lower()
+        query = query.lower()
         results = IStore(self._table).find(
             self._table,
             Or(
diff --git a/lib/lp/soyuz/doc/gina-multiple-arch.rst b/lib/lp/soyuz/doc/gina-multiple-arch.rst
index 5f6c56b..2c9f06b 100644
--- a/lib/lp/soyuz/doc/gina-multiple-arch.rst
+++ b/lib/lp/soyuz/doc/gina-multiple-arch.rst
@@ -176,9 +176,13 @@ distroarchseries:
 
 Check that the source package was correctly imported:
 
-    >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
-    >>> ekg_name = SourcePackageName.selectOneBy(name="ekg")
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
+    >>> from lp.soyuz.interfaces.binarypackagename import (
+    ...     IBinaryPackageNameSet,
+    ... )
+    >>> ekg_name = getUtility(ISourcePackageNameSet)["ekg"]
     >>> ekg = (
     ...     IStore(SourcePackageRelease)
     ...     .find(
@@ -195,11 +199,7 @@ Check that the source package was correctly imported:
 
 And that one of the packages in main is here too:
 
-    >>> libgadu_dev_name = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="libgadu-dev")
-    ...     .one()
-    ... )
+    >>> libgadu_dev_name = getUtility(IBinaryPackageNameSet)["libgadu-dev"]
     >>> libgadu_dev = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
@@ -223,11 +223,7 @@ processed. In particular, its section should be stripped of the
 component name.
 
     >>> from lp.soyuz.enums import PackagePublishingPriority
-    >>> ekg_name = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="ekg")
-    ...     .one()
-    ... )
+    >>> ekg_name = getUtility(IBinaryPackageNameSet)["ekg"]
     >>> ekg = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
@@ -250,11 +246,7 @@ package files are in main! Gina to the rescue: it finds them in the
 right place, updates the component, and creates it with a semi-bogus
 DSC.
 
-    >>> bdftopcf_name = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="bdftopcf")
-    ...     .one()
-    ... )
+    >>> bdftopcf_name = getUtility(IBinaryPackageNameSet)["bdftopcf"]
     >>> bdftopcf = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
diff --git a/lib/lp/soyuz/doc/gina.rst b/lib/lp/soyuz/doc/gina.rst
index b48d787..aac6267 100644
--- a/lib/lp/soyuz/doc/gina.rst
+++ b/lib/lp/soyuz/doc/gina.rst
@@ -244,13 +244,15 @@ forcefully (ubuntu-meta).
 
 Check that x11proto-damage has its Build-Depends-Indep value correctly set:
 
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
-    >>> n = SourcePackageName.selectOneBy(name="x11proto-damage")
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
+    >>> x11p_name = getUtility(ISourcePackageNameSet)["x11proto-damage"]
     >>> x11p = (
     ...     IStore(SourcePackageRelease)
     ...     .find(
     ...         SourcePackageRelease,
-    ...         sourcepackagename=n,
+    ...         sourcepackagename=x11p_name,
     ...         version="6.8.99.7-2",
     ...     )
     ...     .one()
@@ -302,10 +304,10 @@ Same for the copyright:
 Check that the dsc on the libcap package is correct, and that we
 only imported one:
 
-    >>> n = SourcePackageName.selectOneBy(name="libcap")
+    >>> cap_name = getUtility(ISourcePackageNameSet)["libcap"]
     >>> cap = (
     ...     IStore(SourcePackageRelease)
-    ...     .find(SourcePackageRelease, sourcepackagename=n)
+    ...     .find(SourcePackageRelease, sourcepackagename=cap_name)
     ...     .one()
     ... )
     >>> print(cap.dsc)
@@ -338,10 +340,14 @@ only imported one:
 
 Test ubuntu-meta in breezy, which was forcefully imported.
 
-    >>> n = SourcePackageName.selectOneBy(name="ubuntu-meta")
+    >>> um_name = getUtility(ISourcePackageNameSet)["ubuntu-meta"]
     >>> um = (
     ...     IStore(SourcePackageRelease)
-    ...     .find(SourcePackageRelease, sourcepackagename=n, version="0.80")
+    ...     .find(
+    ...         SourcePackageRelease,
+    ...         sourcepackagename=um_name,
+    ...         version="0.80",
+    ...     )
     ...     .one()
     ... )
     >>> print(
@@ -370,10 +376,10 @@ were calculated directly on the files):
 Check that the section on the python-pam package is correct, and that we
 only imported one:
 
-    >>> n = SourcePackageName.selectOneBy(name="python-pam")
+    >>> pp_name = getUtility(ISourcePackageNameSet)["python-pam"]
     >>> pp = (
     ...     IStore(SourcePackageRelease)
-    ...     .find(SourcePackageRelease, sourcepackagename=n)
+    ...     .find(SourcePackageRelease, sourcepackagename=pp_name)
     ...     .one()
     ... )
     >>> print(pp.component.name)
@@ -387,10 +393,10 @@ this is cut up correctly:
 
 Make sure that we only imported one db1-compat source package.
 
-    >>> n = SourcePackageName.selectOneBy(name="db1-compat")
+    >>> db1_name = getUtility(ISourcePackageNameSet)["db1-compat"]
     >>> db1 = (
     ...     IStore(SourcePackageRelease)
-    ...     .find(SourcePackageRelease, sourcepackagename=n)
+    ...     .find(SourcePackageRelease, sourcepackagename=db1_name)
     ...     .one()
     ... )
     >>> print(db1.section.name)
@@ -468,15 +474,13 @@ work.
 Check that the shlibs parsing and bin-only-NMU version handling works as
 expected:
 
-    >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
-    >>> n = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="rioutil")
-    ...     .one()
+    >>> from lp.soyuz.interfaces.binarypackagename import (
+    ...     IBinaryPackageNameSet,
     ... )
+    >>> rio_name = getUtility(IBinaryPackageNameSet)["rioutil"]
     >>> rio = (
     ...     IStore(BinaryPackageRelease)
-    ...     .find(BinaryPackageRelease, binarypackagename=n)
+    ...     .find(BinaryPackageRelease, binarypackagename=rio_name)
     ...     .one()
     ... )
     >>> print(rio.shlibdeps)
@@ -489,10 +493,10 @@ expected:
 Test all the data got to the ed BPR intact, and that the missing
 priority was correctly munged to "extra":
 
-    >>> n = IStore(BinaryPackageName).find(BinaryPackageName, name="ed").one()
+    >>> ed_name = getUtility(IBinaryPackageNameSet)["ed"]
     >>> ed = (
     ...     IStore(BinaryPackageRelease)
-    ...     .find(BinaryPackageRelease, binarypackagename=n)
+    ...     .find(BinaryPackageRelease, binarypackagename=ed_name)
     ...     .one()
     ... )
     >>> print(ed.version)
@@ -527,15 +531,13 @@ We now check if the Breezy publication record has the correct priority:
 Check binary package libgjc-dev in Breezy. Its version number must differ from
 its source version number.
 
-    >>> n = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="libgcj-dev")
-    ...     .one()
-    ... )
+    >>> lib_name = getUtility(IBinaryPackageNameSet)["libgcj-dev"]
     >>> lib = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
-    ...         BinaryPackageRelease, binarypackagename=n, version="4:4.0.1-3"
+    ...         BinaryPackageRelease,
+    ...         binarypackagename=lib_name,
+    ...         version="4:4.0.1-3",
     ...     )
     ...     .one()
     ... )
@@ -548,14 +550,14 @@ its source version number.
 
 Check if the udeb was properly parsed and identified:
 
-    >>> n = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="archive-copier")
-    ...     .one()
-    ... )
+    >>> ac_name = getUtility(IBinaryPackageNameSet)["archive-copier"]
     >>> ac = (
     ...     IStore(BinaryPackageRelease)
-    ...     .find(BinaryPackageRelease, binarypackagename=n, version="0.1.5")
+    ...     .find(
+    ...         BinaryPackageRelease,
+    ...         binarypackagename=ac_name,
+    ...         version="0.1.5",
+    ...     )
     ...     .one()
     ... )
     >>> print(ac.version)
@@ -573,15 +575,13 @@ Check if the udeb was properly parsed and identified:
 
 We check that the binary package publishing override facility works:
 
-    >>> n = (
-    ...     IStore(BinaryPackageName)
-    ...     .find(BinaryPackageName, name="libdb1-compat")
-    ...     .one()
-    ... )
+    >>> db1_name = getUtility(IBinaryPackageNameSet)["libdb1-compat"]
     >>> db1 = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
-    ...         BinaryPackageRelease, binarypackagename=n, version="2.1.3-7"
+    ...         BinaryPackageRelease,
+    ...         binarypackagename=db1_name,
+    ...         version="2.1.3-7",
     ...     )
     ...     .one()
     ... )
@@ -774,10 +774,14 @@ package -- that's what overrides actually do.
     ... )
     >>> print(ed_pub.priority)
     Extra
-    >>> n = SourcePackageName.selectOneBy(name="archive-copier")
+    >>> ac_name = getUtility(ISourcePackageNameSet)["archive-copier"]
     >>> ac = (
     ...     IStore(SourcePackageRelease)
-    ...     .find(SourcePackageRelease, sourcepackagename=n, version="0.3.6")
+    ...     .find(
+    ...         SourcePackageRelease,
+    ...         sourcepackagename=ac_name,
+    ...         version="0.3.6",
+    ...     )
     ...     .one()
     ... )
     >>> ac_pub = (
diff --git a/lib/lp/soyuz/doc/package-meta-classes.rst b/lib/lp/soyuz/doc/package-meta-classes.rst
index 62cc13b..3e39f54 100644
--- a/lib/lp/soyuz/doc/package-meta-classes.rst
+++ b/lib/lp/soyuz/doc/package-meta-classes.rst
@@ -4,8 +4,10 @@ Package Meta Classes
 There are a bunch of meta classes used for combine information from
 our Database Model for packages in a intuitive manner, they are:
 
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
     >>> from lp.registry.model.distribution import Distribution
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
     >>> from lp.services.database.interfaces import IStore
     >>> from lp.soyuz.model.distributionsourcepackagerelease import (
     ...     DistributionSourcePackageRelease,
@@ -26,7 +28,7 @@ Combining Distribution and SourcePackageRelease:
     >>> print(distribution.name)
     ubuntu
 
-    >>> src_name = SourcePackageName.selectOneBy(name="pmount")
+    >>> src_name = getUtility(ISourcePackageNameSet)["pmount"]
     >>> print(src_name.name)
     pmount
 
diff --git a/lib/lp/soyuz/doc/sourcepackagerelease.rst b/lib/lp/soyuz/doc/sourcepackagerelease.rst
index f68e146..2eb4b7b 100644
--- a/lib/lp/soyuz/doc/sourcepackagerelease.rst
+++ b/lib/lp/soyuz/doc/sourcepackagerelease.rst
@@ -237,8 +237,10 @@ kilo-bytes).
 
 Verify that empty packages have a size of zero.
 
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
-    >>> linux_src = SourcePackageName.selectOneBy(name="linux-source-2.6.15")
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
+    >>> linux_src = getUtility(ISourcePackageNameSet)["linux-source-2.6.15"]
     >>> spr = (
     ...     IStore(SourcePackageRelease)
     ...     .find(
diff --git a/lib/lp/soyuz/doc/soyuz-upload.rst b/lib/lp/soyuz/doc/soyuz-upload.rst
index 9413550..ac4512d 100644
--- a/lib/lp/soyuz/doc/soyuz-upload.rst
+++ b/lib/lp/soyuz/doc/soyuz-upload.rst
@@ -325,10 +325,12 @@ Now continue with the real upload.
 Let's check if packages were uploaded correctly.
 
     >>> from operator import attrgetter
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
     >>> from lp.services.database.interfaces import IStore
     >>> from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
-    >>> spn = SourcePackageName.selectOneBy(name="drdsl")
+    >>> spn = getUtility(ISourcePackageNameSet)["drdsl"]
     >>> print(spn.name)
     drdsl
     >>> spr = (
@@ -364,7 +366,7 @@ Let's check if packages were uploaded correctly.
 
 Same thing for etherwake:
 
-    >>> spn = SourcePackageName.selectOneBy(name="etherwake")
+    >>> spn = getUtility(ISourcePackageNameSet)["etherwake"]
     >>> print(spn.name)
     etherwake
     >>> spr = (
@@ -434,7 +436,7 @@ as NEW and RELEASE.
     >>> from lp.soyuz.model.queue import PackageUploadSource
     >>> for name in package_names:
     ...     print(name)
-    ...     spn = SourcePackageName.selectOneBy(name=name)
+    ...     spn = getUtility(ISourcePackageNameSet)[name]
     ...     spr = (
     ...         IStore(SourcePackageRelease)
     ...         .find(SourcePackageRelease, sourcepackagename=spn)
@@ -508,7 +510,7 @@ These packages must now be in the publishing history. Let's check it.
     ... )
     >>> package_names.sort()
     >>> for name in package_names:
-    ...     spn = SourcePackageName.selectOneBy(name=name)
+    ...     spn = getUtility(ISourcePackageNameSet)[name]
     ...     spr = (
     ...         IStore(SourcePackageRelease)
     ...         .find(SourcePackageRelease, sourcepackagename=spn)
diff --git a/lib/lp/soyuz/model/distroseriesdifferencejob.py b/lib/lp/soyuz/model/distroseriesdifferencejob.py
index d1e73f5..6b1faae 100644
--- a/lib/lp/soyuz/model/distroseriesdifferencejob.py
+++ b/lib/lp/soyuz/model/distroseriesdifferencejob.py
@@ -271,7 +271,9 @@ class DistroSeriesDifferenceJob(DistributionJobDerived):
 
     @property
     def sourcepackagename(self):
-        return SourcePackageName.get(self.metadata["sourcepackagename"])
+        return IStore(SourcePackageName).get(
+            SourcePackageName, self.metadata["sourcepackagename"]
+        )
 
     @property
     def derived_series(self):
diff --git a/lib/lp/soyuz/scripts/gina/handlers.py b/lib/lp/soyuz/scripts/gina/handlers.py
index 37ae1f7..8d07ea7 100644
--- a/lib/lp/soyuz/scripts/gina/handlers.py
+++ b/lib/lp/soyuz/scripts/gina/handlers.py
@@ -35,12 +35,12 @@ from lp.archiveuploader.utils import determine_binary_file_type
 from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
 from lp.registry.interfaces.sourcepackage import SourcePackageType
+from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.registry.model.distribution import Distribution
 from lp.registry.model.distroseries import DistroSeries
 from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.services.database.constants import UTC_NOW
 from lp.services.database.interfaces import IStore
-from lp.services.database.sqlobject import SQLObjectNotFound
 from lp.services.librarian.interfaces import ILibraryFileAliasSet
 from lp.services.scripts import log
 from lp.soyuz.enums import (
@@ -61,7 +61,6 @@ from lp.soyuz.interfaces.publishing import (
 )
 from lp.soyuz.interfaces.section import ISectionSet
 from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
-from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.soyuz.model.distroarchseries import DistroArchSeries
 from lp.soyuz.model.files import BinaryPackageFile
@@ -592,9 +591,8 @@ class SourcePackageHandler:
 
         Returns the sourcepackagerelease if exists or none if not.
         """
-        try:
-            spname = SourcePackageName.byName(source)
-        except SQLObjectNotFound:
+        spname = getUtility(ISourcePackageNameSet).queryByName(source)
+        if spname is None:
             return None
 
         # Check if this sourcepackagerelease already exists using name and
@@ -811,10 +809,8 @@ class BinaryPackageHandler:
 
     def checkBin(self, binarypackagedata, distroarchseries):
         """Returns a binarypackage -- if it exists."""
-        binaryname = (
-            IStore(BinaryPackageName)
-            .find(BinaryPackageName, name=binarypackagedata.package)
-            .one()
+        binaryname = getUtility(IBinaryPackageNameSet).queryByName(
+            binarypackagedata.package
         )
         if binaryname is None:
             # If the binary package's name doesn't exist, don't even
diff --git a/lib/lp/translations/doc/poexport-language-pack.rst b/lib/lp/translations/doc/poexport-language-pack.rst
index 996cccd..a243b29 100644
--- a/lib/lp/translations/doc/poexport-language-pack.rst
+++ b/lib/lp/translations/doc/poexport-language-pack.rst
@@ -115,7 +115,9 @@ some DB classes.
     >>> import io
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
     >>> from lp.translations.model.potemplate import POTemplate
 
 Get hold of a person.
@@ -130,7 +132,7 @@ Get the Grumpy distro series.
 
 Get a source package name to go with our distro series.
 
-    >>> spn = SourcePackageName.byName("evolution")
+    >>> spn = getUtility(ISourcePackageNameSet)["evolution"]
 
 Put a dummy file in the Librarian required by the new template we are
 creating.
diff --git a/lib/lp/translations/doc/translationimportqueue.rst b/lib/lp/translations/doc/translationimportqueue.rst
index e8f0793..29dabee 100644
--- a/lib/lp/translations/doc/translationimportqueue.rst
+++ b/lib/lp/translations/doc/translationimportqueue.rst
@@ -112,7 +112,9 @@ Now let's try the same against the evolution sourcepackage that only has an
 IPOTemplate.
 
     >>> hoary_distroseries = DistroSeries.get(3)
-    >>> evolution_sourcepackagename = SourcePackageName.get(9)
+    >>> evolution_sourcepackagename = IStore(SourcePackageName).get(
+    ...     SourcePackageName, 9
+    ... )
     >>> entry = translationimportqueue.addOrUpdateEntry(
     ...     "po/sr.po",
     ...     b"foo",
diff --git a/lib/lp/translations/doc/translationsoverview.rst b/lib/lp/translations/doc/translationsoverview.rst
index 818af4c..162d6d9 100644
--- a/lib/lp/translations/doc/translationsoverview.rst
+++ b/lib/lp/translations/doc/translationsoverview.rst
@@ -17,8 +17,10 @@ test too much.
     >>> from lp.registry.interfaces.karma import IKarmaCacheManager
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet,
+    ... )
     >>> from lp.registry.model.karma import KarmaCategory
-    >>> from lp.registry.model.sourcepackagename import SourcePackageName
     >>> from lp.services.database.interfaces import IStore
     >>> from lp.translations.interfaces.translationsoverview import (
     ...     ITranslationsOverview,
@@ -162,7 +164,9 @@ list as well.
 
     >>> start_karma_update()
     >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
-    >>> evolution_sourcepackagename = SourcePackageName.byName("evolution")
+    >>> evolution_sourcepackagename = getUtility(ISourcePackageNameSet)[
+    ...     "evolution"
+    ... ]
     >>> cache_entry = karmacachemanager.new(
     ...     5150,
     ...     carlos.id,
diff --git a/lib/lp/translations/tests/test_autoapproval.py b/lib/lp/translations/tests/test_autoapproval.py
index eeadbb0..94cfb07 100644
--- a/lib/lp/translations/tests/test_autoapproval.py
+++ b/lib/lp/translations/tests/test_autoapproval.py
@@ -19,11 +19,9 @@ from zope.security.proxy import removeSecurityProxy
 from lp.app.enums import ServiceUsage
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.registry.model.distribution import Distribution
-from lp.registry.model.sourcepackagename import (
-    SourcePackageName,
-    SourcePackageNameSet,
-)
+from lp.registry.model.sourcepackagename import SourcePackageNameSet
 from lp.services.database.interfaces import IPrimaryStore
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.testing import TestCaseWithFactory, verifyObject
@@ -87,7 +85,7 @@ class TestCustomLanguageCode(TestCaseWithFactory):
         )
 
         self.distro = Distribution.byName("ubuntu")
-        self.sourcepackagename = SourcePackageName.byName("evolution")
+        self.sourcepackagename = getUtility(ISourcePackageNameSet)["evolution"]
         self.package_codes["Brazilian"] = CustomLanguageCode(
             translation_target=self.distro.getSourcePackage(
                 self.sourcepackagename
@@ -118,7 +116,7 @@ class TestCustomLanguageCode(TestCaseWithFactory):
         brazilian = gentoo_package.getCustomLanguageCode("Brazilian")
         self.assertEqual(brazilian, None)
 
-        cnews = SourcePackageName.byName("cnews")
+        cnews = getUtility(ISourcePackageNameSet)["cnews"]
         cnews_package = self.distro.getSourcePackage(cnews)
         self.assertEqual(cnews_package.getCustomLanguageCode("nocode"), None)
         self.assertEqual(