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

[Colin Watson]

Convert BinaryPackageName to Storm

[Ines Almeida (ines-almeida)]

review: Approve

diff --git a/lib/lp/archiveuploader/tests/test_uploadprocessor.py b/lib/lp/archiveuploader/tests/test_uploadprocessor.py
index 665bc0b..861dbe3 100644
--- a/lib/lp/archiveuploader/tests/test_uploadprocessor.py
+++ b/lib/lp/archiveuploader/tests/test_uploadprocessor.py
@@ -1160,7 +1160,11 @@ class TestUploadProcessor(StatsMixin, TestUploadProcessorBase):
         self.processUpload(uploadprocessor, upload_dir)
 
         # Find the binarypackagerelease and check its component.
-        foocomm_binname = BinaryPackageName.selectOneBy(name="foocomm")
+        foocomm_binname = (
+            IStore(BinaryPackageName)
+            .find(BinaryPackageName, name="foocomm")
+            .one()
+        )
         foocomm_bpr = (
             IStore(BinaryPackageRelease)
             .find(BinaryPackageRelease, binarypackagename=foocomm_binname)
diff --git a/lib/lp/registry/model/distribution.py b/lib/lp/registry/model/distribution.py
index 6e245b7..a38cb03 100644
--- a/lib/lp/registry/model/distribution.py
+++ b/lib/lp/registry/model/distribution.py
@@ -1790,7 +1790,11 @@ 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 = BinaryPackageName.selectOneBy(name=pkgname)
+        binarypackagename = (
+            IStore(BinaryPackageName)
+            .find(BinaryPackageName, name=pkgname)
+            .one()
+        )
         if binarypackagename:
             # Ok, so we have a binarypackage with that name. Grab its
             # latest publication in the distribution (this may be an old
diff --git a/lib/lp/registry/model/distroseries.py b/lib/lp/registry/model/distroseries.py
index cd596f2..d34d571 100644
--- a/lib/lp/registry/model/distroseries.py
+++ b/lib/lp/registry/model/distroseries.py
@@ -1052,9 +1052,12 @@ class DistroSeries(
     def getBinaryPackage(self, name):
         """See `IDistroSeries`."""
         if not IBinaryPackageName.providedBy(name):
-            try:
-                name = BinaryPackageName.byName(name)
-            except SQLObjectNotFound:
+            name = (
+                IStore(BinaryPackageName)
+                .find(BinaryPackageName, name=name)
+                .one()
+            )
+            if name is None:
                 return None
         return DistroSeriesBinaryPackage(self, name)
 
diff --git a/lib/lp/soyuz/doc/distroarchseriesbinarypackage.rst b/lib/lp/soyuz/doc/distroarchseriesbinarypackage.rst
index 2b51ad9..90fd4b1 100644
--- a/lib/lp/soyuz/doc/distroarchseriesbinarypackage.rst
+++ b/lib/lp/soyuz/doc/distroarchseriesbinarypackage.rst
@@ -2,14 +2,23 @@
 Distro Arch Series Binary Package
 =================================
 
+    >>> from lp.services.database.interfaces import IStore
     >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
     >>> from lp.soyuz.model.distroarchseries import DistroArchSeries
     >>> from lp.soyuz.model.distroarchseriesbinarypackage import (
     ...     DistroArchSeriesBinaryPackage,
     ... )
     >>> hoary_i386 = DistroArchSeries.get(6)
-    >>> pmount_name = BinaryPackageName.selectOneBy(name="pmount")
-    >>> firefox_name = BinaryPackageName.selectOneBy(name="mozilla-firefox")
+    >>> pmount_name = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="pmount")
+    ...     .one()
+    ... )
+    >>> firefox_name = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="mozilla-firefox")
+    ...     .one()
+    ... )
     >>> pmount_hoary_i386 = DistroArchSeriesBinaryPackage(
     ...     hoary_i386, pmount_name
     ... )
@@ -28,7 +37,6 @@ builds that are in sampledata!
 
     >>> from lp.soyuz.model.publishing import BinaryPackagePublishingHistory
     >>> from lp.services.database.constants import UTC_NOW
-    >>> from lp.services.database.interfaces import IStore
     >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
     >>> from lp.soyuz.model.component import Component
     >>> from lp.soyuz.model.section import Section
@@ -263,14 +271,12 @@ Then, supersede all pmount publications in warty for pmount (this sets
 us up to demonstrate bug 208233).
 
     >>> switch_dbuser("archivepublisher")
-    >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
-    >>> from lp.soyuz.model.distroarchseries import DistroArchSeries
-    >>> from lp.soyuz.model.distroarchseriesbinarypackage import (
-    ...     DistroArchSeriesBinaryPackage,
-    ... )
-    >>> from lp.soyuz.model.publishing import BinaryPackagePublishingHistory
     >>> warty_i386 = DistroArchSeries.get(1)
-    >>> pmount_name = BinaryPackageName.selectOneBy(name="pmount")
+    >>> pmount_name = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="pmount")
+    ...     .one()
+    ... )
     >>> pmount_warty_i386 = DistroArchSeriesBinaryPackage(
     ...     warty_i386, pmount_name
     ... )
diff --git a/lib/lp/soyuz/doc/distroseriesbinarypackage.rst b/lib/lp/soyuz/doc/distroseriesbinarypackage.rst
index a7386f6..011cf86 100644
--- a/lib/lp/soyuz/doc/distroseriesbinarypackage.rst
+++ b/lib/lp/soyuz/doc/distroseriesbinarypackage.rst
@@ -8,15 +8,18 @@ releases and/or architectures for a given binary package name within a
 specific distribution series.
 
     >>> from zope.component import getUtility
-    >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
     >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.services.database.interfaces import IStore
+    >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
 
 A DistroSeriesBinaryPackage is normally accessed via a Distro
 Series:
 
     >>> ubuntu = getUtility(IDistributionSet)["ubuntu"]
-    >>> firefox_bin_name = BinaryPackageName.selectOneBy(
-    ...     name="mozilla-firefox"
+    >>> firefox_bin_name = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="mozilla-firefox")
+    ...     .one()
     ... )
     >>> firefox_dsbp = ubuntu["warty"].getBinaryPackage(firefox_bin_name)
 
diff --git a/lib/lp/soyuz/doc/gina-multiple-arch.rst b/lib/lp/soyuz/doc/gina-multiple-arch.rst
index 495b8eb..e2d84b1 100644
--- a/lib/lp/soyuz/doc/gina-multiple-arch.rst
+++ b/lib/lp/soyuz/doc/gina-multiple-arch.rst
@@ -182,7 +182,11 @@ Check that the source package was correctly imported:
 
 And that one of the packages in main is here too:
 
-    >>> n = BinaryPackageName.selectOneBy(name="libgadu-dev")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="libgadu-dev")
+    ...     .one()
+    ... )
     >>> ekg = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
@@ -206,7 +210,11 @@ processed. In particular, its section should be stripped of the
 component name.
 
     >>> from lp.soyuz.enums import PackagePublishingPriority
-    >>> n = BinaryPackageName.selectOneBy(name="ekg")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="ekg")
+    ...     .one()
+    ... )
     >>> ekg = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
@@ -229,7 +237,11 @@ 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.
 
-    >>> n = BinaryPackageName.selectOneBy(name="bdftopcf")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="bdftopcf")
+    ...     .one()
+    ... )
     >>> ekg = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
diff --git a/lib/lp/soyuz/doc/gina.rst b/lib/lp/soyuz/doc/gina.rst
index 39bcbdb..a934313 100644
--- a/lib/lp/soyuz/doc/gina.rst
+++ b/lib/lp/soyuz/doc/gina.rst
@@ -445,7 +445,11 @@ Check that the shlibs parsing and bin-only-NMU version handling works as
 expected:
 
     >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
-    >>> n = BinaryPackageName.selectOneBy(name="rioutil")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="rioutil")
+    ...     .one()
+    ... )
     >>> rio = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(BinaryPackageRelease, binarypackagename=n)
@@ -461,7 +465,7 @@ expected:
 Test all the data got to the ed BPR intact, and that the missing
 priority was correctly munged to "extra":
 
-    >>> n = BinaryPackageName.selectOneBy(name="ed")
+    >>> n = IStore(BinaryPackageName).find(BinaryPackageName, name="ed").one()
     >>> ed = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(BinaryPackageRelease, binarypackagename=n)
@@ -499,7 +503,11 @@ 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 = BinaryPackageName.selectOneBy(name="libgcj-dev")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="libgcj-dev")
+    ...     .one()
+    ... )
     >>> lib = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
@@ -516,7 +524,11 @@ its source version number.
 
 Check if the udeb was properly parsed and identified:
 
-    >>> n = BinaryPackageName.selectOneBy(name="archive-copier")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="archive-copier")
+    ...     .one()
+    ... )
     >>> ac = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(BinaryPackageRelease, binarypackagename=n, version="0.1.5")
@@ -537,7 +549,11 @@ Check if the udeb was properly parsed and identified:
 
 We check that the binary package publishing override facility works:
 
-    >>> n = BinaryPackageName.selectOneBy(name="libdb1-compat")
+    >>> n = (
+    ...     IStore(BinaryPackageName)
+    ...     .find(BinaryPackageName, name="libdb1-compat")
+    ...     .one()
+    ... )
     >>> db1 = (
     ...     IStore(BinaryPackageRelease)
     ...     .find(
diff --git a/lib/lp/soyuz/model/binarypackagename.py b/lib/lp/soyuz/model/binarypackagename.py
index a60dbab..bb55043 100644
--- a/lib/lp/soyuz/model/binarypackagename.py
+++ b/lib/lp/soyuz/model/binarypackagename.py
@@ -6,15 +6,14 @@ __all__ = [
     "BinaryPackageNameSet",
 ]
 
-import six
 from storm.expr import Join
+from storm.properties import Int, Unicode
 from storm.store import EmptyResultSet
 from zope.interface import implementer
 
 from lp.app.errors import NotFoundError
 from lp.services.database.interfaces import IStore
-from lp.services.database.sqlbase import SQLBase
-from lp.services.database.sqlobject import SQLObjectNotFound, StringCol
+from lp.services.database.stormbase import StormBase
 from lp.soyuz.interfaces.binarypackagename import (
     IBinaryPackageName,
     IBinaryPackageNameSet,
@@ -23,11 +22,15 @@ from lp.soyuz.interfaces.publishing import active_publishing_status
 
 
 @implementer(IBinaryPackageName)
-class BinaryPackageName(SQLBase):
-    _table = "BinaryPackageName"
-    name = StringCol(
-        dbName="name", notNull=True, unique=True, alternateID=True
-    )
+class BinaryPackageName(StormBase):
+    __storm_table__ = "BinaryPackageName"
+
+    id = Int(primary=True)
+    name = Unicode(name="name", allow_none=False)
+
+    def __init__(self, name):
+        super().__init__()
+        self.name = name
 
     def __str__(self):
         return self.name
@@ -40,24 +43,28 @@ class BinaryPackageName(SQLBase):
 class BinaryPackageNameSet:
     def __getitem__(self, name):
         """See `IBinaryPackageNameSet`."""
-        try:
-            return BinaryPackageName.byName(name)
-        except SQLObjectNotFound:
+        bpn = (
+            IStore(BinaryPackageName).find(BinaryPackageName, name=name).one()
+        )
+        if bpn is None:
             raise NotFoundError(name)
+        return bpn
 
     def getAll(self):
         """See `IBinaryPackageNameSet`."""
-        return BinaryPackageName.select()
+        return IStore(BinaryPackageName).find(BinaryPackageName)
 
     def queryByName(self, name):
         return (
-            IStore(BinaryPackageName)
-            .find(BinaryPackageName, name=six.ensure_text(name, "ASCII"))
-            .one()
+            IStore(BinaryPackageName).find(BinaryPackageName, name=name).one()
         )
 
     def new(self, name):
-        return BinaryPackageName(name=six.ensure_text(name, "ASCII"))
+        bpn = BinaryPackageName(name=name)
+        store = IStore(BinaryPackageName)
+        store.add(bpn)
+        store.flush()
+        return bpn
 
     def ensure(self, name):
         """Ensure that the given BinaryPackageName exists, creating it
@@ -65,7 +72,6 @@ class BinaryPackageNameSet:
 
         Returns the BinaryPackageName
         """
-        name = six.ensure_text(name, "ASCII")
         try:
             return self[name]
         except NotFoundError:
diff --git a/lib/lp/soyuz/model/distroarchseries.py b/lib/lp/soyuz/model/distroarchseries.py
index 15bd5ef..cb9b669 100644
--- a/lib/lp/soyuz/model/distroarchseries.py
+++ b/lib/lp/soyuz/model/distroarchseries.py
@@ -24,7 +24,6 @@ from lp.services.database.sqlobject import (
     BoolCol,
     ForeignKey,
     IntCol,
-    SQLObjectNotFound,
     StringCol,
 )
 from lp.services.database.stormexpr import fti_search, rank_by_fti
@@ -348,9 +347,12 @@ class DistroArchSeries(SQLBase):
         )
 
         if not IBinaryPackageName.providedBy(name):
-            try:
-                name = BinaryPackageName.byName(name)
-            except SQLObjectNotFound:
+            name = (
+                IStore(BinaryPackageName)
+                .find(BinaryPackageName, name=name)
+                .one()
+            )
+            if name is None:
                 return None
         return DistroArchSeriesBinaryPackage(self, name)
 
diff --git a/lib/lp/soyuz/scripts/gina/handlers.py b/lib/lp/soyuz/scripts/gina/handlers.py
index 67368b9..ae2d08c 100644
--- a/lib/lp/soyuz/scripts/gina/handlers.py
+++ b/lib/lp/soyuz/scripts/gina/handlers.py
@@ -805,9 +805,12 @@ class BinaryPackageHandler:
 
     def checkBin(self, binarypackagedata, distroarchseries):
         """Returns a binarypackage -- if it exists."""
-        try:
-            binaryname = BinaryPackageName.byName(binarypackagedata.package)
-        except SQLObjectNotFound:
+        binaryname = (
+            IStore(BinaryPackageName)
+            .find(BinaryPackageName, name=binarypackagedata.package)
+            .one()
+        )
+        if binaryname is None:
             # If the binary package's name doesn't exist, don't even
             # bother looking for a binary package.
             return None