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

[Colin Watson]

Convert EmailAddress to Storm

[Ines Almeida (ines-almeida)]

LGTM

review: Approve

[Ines Almeida (ines-almeida)]

review: Approve

diff --git a/lib/lp/app/doc/batch-navigation.rst b/lib/lp/app/doc/batch-navigation.rst
index a93b8b8..25274f1 100644
--- a/lib/lp/app/doc/batch-navigation.rst
+++ b/lib/lp/app/doc/batch-navigation.rst
@@ -64,8 +64,11 @@ Multiple pages
 
 The batch navigator tells us whether multiple pages will be used.
 
+    >>> from lp.services.database.interfaces import IStore
     >>> from lp.services.identity.model.emailaddress import EmailAddress
-    >>> select_results = EmailAddress.select(orderBy="id")
+    >>> select_results = (
+    ...     IStore(EmailAddress).find(EmailAddress).order_by("id")
+    ... )
     >>> batch_nav = BatchNavigator(select_results, build_request(), size=50)
     >>> batch_nav.has_multiple_pages
     True
diff --git a/lib/lp/code/model/revision.py b/lib/lp/code/model/revision.py
index 3777ebd..b47402d 100644
--- a/lib/lp/code/model/revision.py
+++ b/lib/lp/code/model/revision.py
@@ -235,7 +235,7 @@ class RevisionAuthor(StormBase):
             return False
         # Only accept an email address that is validated.
         if lp_email.status != EmailAddressStatus.NEW:
-            self.person_id = lp_email.personID
+            self.person_id = lp_email.person_id
             return True
         else:
             return False
diff --git a/lib/lp/registry/browser/peoplemerge.py b/lib/lp/registry/browser/peoplemerge.py
index 3dffe4e..b89646b 100644
--- a/lib/lp/registry/browser/peoplemerge.py
+++ b/lib/lp/registry/browser/peoplemerge.py
@@ -166,7 +166,7 @@ class AdminMergeBaseView(ValidatingMergeView):
                 # EmailAddress.person is a readonly field, so we need to
                 # remove the security proxy here.
                 naked_email = removeSecurityProxy(email)
-                naked_email.personID = self.target_person.id
+                naked_email.person = self.target_person
                 naked_email.status = EmailAddressStatus.NEW
         getUtility(IPersonSet).mergeAsync(
             self.dupe_person,
diff --git a/lib/lp/registry/browser/person.py b/lib/lp/registry/browser/person.py
index 2ce4be6..5ca39fe 100644
--- a/lib/lp/registry/browser/person.py
+++ b/lib/lp/registry/browser/person.py
@@ -527,7 +527,7 @@ class PersonNavigation(BranchTraversalMixin, Navigation):
     def traverse_email(self, email):
         """Traverse to this person's emails on the webservice layer."""
         email = getUtility(IEmailAddressSet).getByEmail(email)
-        if email is None or email.personID != self.context.id:
+        if email is None or email.person != self.context:
             return None
         return email
 
@@ -1146,7 +1146,7 @@ class BeginTeamClaimView(LaunchpadFormView):
                 "generated based on the email address it's "
                 "associated with." % self.context.name
             )
-        elif email.personID != self.context.id:
+        elif email.person != self.context:
             error = structured(
                 "This email address is associated with yet another "
                 "Launchpad profile, which you seem to have used at "
diff --git a/lib/lp/registry/doc/person-account.rst b/lib/lp/registry/doc/person-account.rst
index e4cf997..21bb628 100644
--- a/lib/lp/registry/doc/person-account.rst
+++ b/lib/lp/registry/doc/person-account.rst
@@ -16,7 +16,6 @@ process. Matsubara's account was created during a code import.
     >>> from lp.services.identity.interfaces.emailaddress import (
     ...     IEmailAddressSet,
     ... )
-    >>> from lp.registry.interfaces.person import IPersonSet
 
     >>> emailset = getUtility(IEmailAddressSet)
     >>> emailaddress = emailset.getByEmail("[e-mail]")
@@ -68,9 +67,8 @@ them, so we'll assign one just to prove that deactivating their account
 will cause this spec to be reassigned.
 
 
-    >>> personset = getUtility(IPersonSet)
     >>> foobar_preferredemail = emailset.getByEmail("[e-mail]")
-    >>> foobar = personset.get(foobar_preferredemail.personID)
+    >>> foobar = foobar_preferredemail.person
     >>> foobar.specifications(None).is_empty()
     False
 
diff --git a/lib/lp/registry/model/mailinglist.py b/lib/lp/registry/model/mailinglist.py
index c27fbae..fd26b09 100644
--- a/lib/lp/registry/model/mailinglist.py
+++ b/lib/lp/registry/model/mailinglist.py
@@ -332,7 +332,7 @@ class MailingList(StormBase):
                     email
                 ).status = EmailAddressStatus.VALIDATED
             assert (
-                email.personID == self.team_id
+                email.person == self.team
             ), "Email already associated with another team."
 
     def _setAndNotifyDateActivated(self):
@@ -361,7 +361,7 @@ class MailingList(StormBase):
         if email is not None and self.team.preferredemail is not None:
             if email.id == self.team.preferredemail.id:
                 self.team.setContactAddress(None)
-        assert email.personID == self.team_id, "Incorrectly linked email."
+        assert email.person == self.team, "Incorrectly linked email."
         # Anyone with permission to deactivate a list can also set the
         # email address status to NEW.
         removeSecurityProxy(email).status = EmailAddressStatus.NEW
@@ -435,7 +435,7 @@ class MailingList(StormBase):
             raise CannotSubscribe(
                 "Teams cannot be mailing list members: %s" % person.displayname
             )
-        if address is not None and address.personID != person.id:
+        if address is not None and address.person != person:
             raise CannotSubscribe(
                 "%s does not own the email address: %s"
                 % (person.displayname, address.email)
@@ -469,7 +469,7 @@ class MailingList(StormBase):
                 "%s is not a member of the mailing list: %s"
                 % (person.displayname, self.team.displayname)
             )
-        if address is not None and address.personID != person.id:
+        if address is not None and address.person != person:
             raise CannotChangeSubscription(
                 "%s does not own the email address: %s"
                 % (person.displayname, address.email)
@@ -645,7 +645,7 @@ class MailingListSet:
         Team = ClassAlias(Person)
         tables = (
             EmailAddress,
-            Join(Person, Person.id == EmailAddress.personID),
+            Join(Person, Person.id == EmailAddress.person_id),
             Join(Account, Account.id == Person.account_id),
             Join(TeamParticipation, TeamParticipation.person_id == Person.id),
             Join(
@@ -702,7 +702,7 @@ class MailingListSet:
         tables = (
             Person,
             Join(Account, Account.id == Person.account_id),
-            Join(EmailAddress, EmailAddress.personID == Person.id),
+            Join(EmailAddress, EmailAddress.person_id == Person.id),
             Join(TeamParticipation, TeamParticipation.person_id == Person.id),
             Join(
                 MailingList, MailingList.team_id == TeamParticipation.team_id
@@ -728,7 +728,7 @@ class MailingListSet:
         tables = (
             Person,
             Join(Account, Account.id == Person.account_id),
-            Join(EmailAddress, EmailAddress.personID == Person.id),
+            Join(EmailAddress, EmailAddress.person_id == Person.id),
             Join(MessageApproval, MessageApproval.posted_by_id == Person.id),
             Join(
                 MailingList, MailingList.id == MessageApproval.mailing_list_id
diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index 1aa22bc..4846cd9 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -2109,11 +2109,7 @@ class Person(
         )
 
     def _getEmailsByStatus(self, status):
-        return Store.of(self).find(
-            EmailAddress,
-            EmailAddress.personID == self.id,
-            EmailAddress.status == status,
-        )
+        return Store.of(self).find(EmailAddress, person=self, status=status)
 
     def checkInclusiveMembershipPolicyAllowed(self, policy="open"):
         """See `ITeam`"""
@@ -2258,7 +2254,7 @@ class Person(
             LeftJoin(
                 email_table,
                 And(
-                    email_table.personID == person_table.id,
+                    email_table.person_id == person_table.id,
                     email_table.status == EmailAddressStatus.PREFERRED,
                 ),
             )
@@ -3041,10 +3037,8 @@ class Person(
                 "Any person's email address must provide the IEmailAddress "
                 "interface. %s doesn't." % email
             )
-        # XXX Steve Alexander 2005-07-05:
-        # This is here because of an SQLobject comparison oddity.
-        assert email.personID == self.id, "Wrong person! %r, %r" % (
-            email.personID,
+        assert email.person == self, "Wrong person! %r, %r" % (
+            email.person_id,
             self.id,
         )
 
@@ -3056,7 +3050,7 @@ class Person(
             IStore(EmailAddress)
             .find(
                 EmailAddress,
-                EmailAddress.personID == self.id,
+                EmailAddress.person == self,
                 EmailAddress.status == EmailAddressStatus.PREFERRED,
             )
             .one()
@@ -3095,9 +3089,7 @@ class Person(
             )
         else:
             mailing_list_email = None
-        all_addresses = IStore(EmailAddress).find(
-            EmailAddress, EmailAddress.personID == self.id
-        )
+        all_addresses = IStore(EmailAddress).find(EmailAddress, person=self)
         for address in all_addresses:
             # Delete all email addresses that are not the preferred email
             # address, or the team's email address. If this method was called
@@ -3112,7 +3104,7 @@ class Person(
             IStore(EmailAddress)
             .find(
                 EmailAddress,
-                personID=self.id,
+                person=self,
                 status=EmailAddressStatus.PREFERRED,
             )
             .one()
@@ -3143,12 +3135,12 @@ class Person(
                 "Any person's email address must provide the IEmailAddress "
                 "interface. %s doesn't." % email
             )
-        assert email.personID == self.id
+        assert email.person == self
         existing_preferred_email = (
             IStore(EmailAddress)
             .find(
                 EmailAddress,
-                personID=self.id,
+                person=self,
                 status=EmailAddressStatus.PREFERRED,
             )
             .one()
@@ -4520,7 +4512,7 @@ class PersonSet:
         return (
             IStore(Person)
             .using(
-                Person, Join(EmailAddress, EmailAddress.personID == Person.id)
+                Person, Join(EmailAddress, EmailAddress.person_id == Person.id)
             )
             .find(
                 (EmailAddress, Person),
@@ -5543,7 +5535,7 @@ def _get_recipients_for_team(team):
         # Find Persons that have a preferred email address and an active
         # account, or are a team, or both.
         intermediate_transitive_results = source.find(
-            (TeamMembership.person_id, EmailAddress.personID),
+            (TeamMembership.person_id, EmailAddress.person_id),
             TeamMembership.status.is_in(
                 (
                     TeamMembershipStatus.ADMIN,
@@ -5553,7 +5545,7 @@ def _get_recipients_for_team(team):
             TeamMembership.team_id.is_in(pending_team_ids),
             Or(
                 And(
-                    EmailAddress.personID != None,
+                    EmailAddress.person != None,
                     Account.status == AccountStatus.ACTIVE,
                 ),
                 Person.teamownerID != None,
diff --git a/lib/lp/registry/scripts/closeaccount.py b/lib/lp/registry/scripts/closeaccount.py
index d744b92..c7d4c55 100644
--- a/lib/lp/registry/scripts/closeaccount.py
+++ b/lib/lp/registry/scripts/closeaccount.py
@@ -60,7 +60,7 @@ def close_account(username, log):
 
     person = (
         store.using(
-            Person, LeftJoin(EmailAddress, Person.id == EmailAddress.personID)
+            Person, LeftJoin(EmailAddress, Person.id == EmailAddress.person_id)
         )
         .find(
             Person,
@@ -218,7 +218,7 @@ def close_account(username, log):
     # people requesting account removal seem to primarily be interested
     # in ensuring we no longer store this information.
     table_notification("EmailAddress")
-    store.find(EmailAddress, EmailAddress.personID == person.id).remove()
+    store.find(EmailAddress, person=person).remove()
 
     # Clean out personal details from the Person table
     table_notification("Person")
diff --git a/lib/lp/registry/stories/teammembership/xx-teammembership.rst b/lib/lp/registry/stories/teammembership/xx-teammembership.rst
index 3912580..a7b5a3b 100644
--- a/lib/lp/registry/stories/teammembership/xx-teammembership.rst
+++ b/lib/lp/registry/stories/teammembership/xx-teammembership.rst
@@ -88,11 +88,12 @@ the team's home page.
 If this was a moderated team, the membership would not have been automatically
 approved, though.
 
+    >>> from storm.locals import Store
     >>> from lp.registry.interfaces.person import TeamMembershipPolicy
     >>> from lp.registry.model.person import Person
     >>> myemail = Person.selectOneBy(name="myemail")
     >>> myemail.membership_policy = TeamMembershipPolicy.MODERATED
-    >>> myemail.syncUpdate()
+    >>> Store.of(myemail).flush()
 
     >>> browser = setupBrowser(
     ...     auth="Basic [e-mail]:test"
@@ -142,7 +143,7 @@ Delegated teams also require approval of direct membership.
 
     >>> login("[e-mail]")
     >>> myemail.membership_policy = TeamMembershipPolicy.DELEGATED
-    >>> myemail.syncUpdate()
+    >>> Store.of(myemail).flush()
     >>> logout()
 
     >>> browser = setupBrowser(auth="Basic [e-mail]:test")
@@ -180,7 +181,7 @@ Delegated teams also require approval of direct membership.
 If it was a restricted team, users wouldn't even see a link to join the team.
 
     >>> myemail.membership_policy = TeamMembershipPolicy.RESTRICTED
-    >>> myemail.syncUpdate()
+    >>> Store.of(myemail).flush()
 
     >>> browser = setupBrowser(auth="Basic [e-mail]:test")
     >>> browser.open("http://launchpad.test/~myemail")
diff --git a/lib/lp/registry/tests/test_person_merge_job.py b/lib/lp/registry/tests/test_person_merge_job.py
index 319ed86..b3a5f99 100644
--- a/lib/lp/registry/tests/test_person_merge_job.py
+++ b/lib/lp/registry/tests/test_person_merge_job.py
@@ -48,8 +48,7 @@ def transfer_email(job):
     IPersonSet.merge() does not (yet) promise to do this.
     """
     from_email = removeSecurityProxy(job.from_person.preferredemail)
-    from_email.personID = job.to_person.id
-    from_email.account_id = job.to_person.account_id
+    from_email.person = job.to_person
     from_email.status = EmailAddressStatus.NEW
     IStore(from_email).flush()
 
diff --git a/lib/lp/registry/tests/test_personset.py b/lib/lp/registry/tests/test_personset.py
index dc8f36f..fc8650f 100644
--- a/lib/lp/registry/tests/test_personset.py
+++ b/lib/lp/registry/tests/test_personset.py
@@ -368,7 +368,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
         return self.store.add(
             EmailAddress(
                 email=email,
-                account=person.account,
                 person=person,
                 status=EmailAddressStatus.PREFERRED,
             )
@@ -388,7 +387,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
         self.assertIs(self.person, found)
         self.assertIs(self.account, found.account)
         self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
         self.assertIs(self.email.person, self.person)
         self.assertEqual(
             [self.identifier], list(self.account.openid_identifiers)
@@ -410,7 +408,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
         self.assertIs(self.person, found)
         self.assertIs(self.account, found.account)
         self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
         self.assertIs(self.email.person, self.person)
         self.assertEqual(
             [self.identifier], list(self.account.openid_identifiers)
@@ -433,7 +430,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
         self.assertIs(self.person, found)
         self.assertIs(self.account, found.account)
         self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
         self.assertIs(self.email.person, self.person)
 
         # Old OpenId Identifier still attached.
@@ -474,7 +470,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
     def testNoAccount(self):
         # EmailAddress is linked to a Person, but there is no Account.
         # Convert this stub into something valid.
-        self.email.account = None
         self.email.status = EmailAddressStatus.NEW
         self.person.account = None
         new_identifier = "new_identifier"
@@ -503,7 +498,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
         self.identifier.account = self.store.find(
             Account, displayname="Foo Bar"
         ).one()
-        email_account = self.email.account
 
         found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
             self.identifier.identifier,
@@ -519,7 +513,6 @@ class TestPersonSetCreateByOpenId(TestCaseWithFactory):
 
         self.assertIs(found.account, self.identifier.account)
         self.assertIn(self.identifier, list(found.account.openid_identifiers))
-        self.assertIs(email_account, self.email.account)
 
     def testEmptyOpenIDIdentifier(self):
         self.assertRaises(
diff --git a/lib/lp/registry/tests/test_team.py b/lib/lp/registry/tests/test_team.py
index e00db68..5ab0e4f 100644
--- a/lib/lp/registry/tests/test_team.py
+++ b/lib/lp/registry/tests/test_team.py
@@ -47,9 +47,7 @@ class TestTeamContactAddress(TestCaseWithFactory):
 
     def getAllEmailAddresses(self):
         transaction.commit()
-        all_addresses = self.store.find(
-            EmailAddress, EmailAddress.personID == self.team.id
-        )
+        all_addresses = self.store.find(EmailAddress, person=self.team)
         return [address for address in all_addresses.order_by("email")]
 
     def createMailingListAndGetAddress(self):
diff --git a/lib/lp/registry/vocabularies.py b/lib/lp/registry/vocabularies.py
index 1c1c5f4..a733f84 100644
--- a/lib/lp/registry/vocabularies.py
+++ b/lib/lp/registry/vocabularies.py
@@ -746,9 +746,11 @@ class ValidPersonOrTeamVocabulary(
         # description so we need to bulk load them for performance, otherwise
         # we get one query per person per attribute.
         def pre_iter_hook(persons):
-            emails = bulk.load_referencing(EmailAddress, persons, ["personID"])
+            emails = bulk.load_referencing(
+                EmailAddress, persons, ["person_id"]
+            )
             email_by_person = {
-                email.personID: email
+                email.person_id: email
                 for email in emails
                 if email.status == EmailAddressStatus.PREFERRED
             }
diff --git a/lib/lp/scripts/garbo.py b/lib/lp/scripts/garbo.py
index f27f0b5..ef0a095 100644
--- a/lib/lp/scripts/garbo.py
+++ b/lib/lp/scripts/garbo.py
@@ -1023,7 +1023,7 @@ class RevisionAuthorEmailLinker(TunableLoop):
 
         emails = dict(
             self.email_store.find(
-                (EmailAddress.email.lower(), EmailAddress.personID),
+                (EmailAddress.email.lower(), EmailAddress.person_id),
                 EmailAddress.email.lower().is_in(
                     [author.email.lower() for author in authors]
                 ),
@@ -1033,7 +1033,7 @@ class RevisionAuthorEmailLinker(TunableLoop):
                         EmailAddressStatus.VALIDATED,
                     ]
                 ),
-                EmailAddress.personID != None,
+                EmailAddress.person != None,
             )
         )
 
diff --git a/lib/lp/services/database/doc/storm.rst b/lib/lp/services/database/doc/storm.rst
index e9b84c9..2c38e6c 100644
--- a/lib/lp/services/database/doc/storm.rst
+++ b/lib/lp/services/database/doc/storm.rst
@@ -162,7 +162,7 @@ Objects not yet flushed to the database also compare equal.
     >>> unflushed = EmailAddress(
     ...     email="[e-mail]",
     ...     status=EmailAddressStatus.NEW,
-    ...     personID=1,
+    ...     person=getUtility(IPersonSet).get(1),
     ... )
     >>> unflushed == unflushed
     True
diff --git a/lib/lp/services/identity/configure.zcml b/lib/lp/services/identity/configure.zcml
index 66aea4e..b54af81 100644
--- a/lib/lp/services/identity/configure.zcml
+++ b/lib/lp/services/identity/configure.zcml
@@ -16,9 +16,7 @@
             attributes="
                 id
                 person
-                personID
-                account
-                account_id
+                person_id
                 status
                 rdf_sha1"/>
         <require
diff --git a/lib/lp/services/identity/interfaces/emailaddress.py b/lib/lp/services/identity/interfaces/emailaddress.py
index cbd0198..450c96b 100644
--- a/lib/lp/services/identity/interfaces/emailaddress.py
+++ b/lib/lp/services/identity/interfaces/emailaddress.py
@@ -120,7 +120,7 @@ class IEmailAddress(IHasOwner):
             title=_("Person"), required=True, readonly=False, schema=Interface
         )
     )
-    personID = Int(title=_("PersonID"), required=True, readonly=True)
+    person_id = Int(title=_("Person ID"), required=True, readonly=True)
 
     rdf_sha1 = TextLine(
         title=_("RDF-ready SHA-1 Hash"),
@@ -139,13 +139,6 @@ class IEmailAddress(IHasOwner):
             preferred one or a hosted mailing list's address.
         """
 
-    def syncUpdate():
-        """Write updates made on this object to the database.
-
-        This should be used when you can't wait until the transaction is
-        committed to have some updates actually written to the database.
-        """
-
 
 class IEmailAddressSet(Interface):
     """The set of EmailAddresses."""
diff --git a/lib/lp/services/identity/model/emailaddress.py b/lib/lp/services/identity/model/emailaddress.py
index c80f10e..043a2f6 100644
--- a/lib/lp/services/identity/model/emailaddress.py
+++ b/lib/lp/services/identity/model/emailaddress.py
@@ -12,15 +12,13 @@ __all__ = [
 import hashlib
 import operator
 
-import six
-from storm.expr import Lower
+from storm.locals import Int, Reference, Unicode
 from zope.interface import implementer
 
 from lp.app.validators.email import valid_email
 from lp.services.database.enumcol import DBEnum
 from lp.services.database.interfaces import IPrimaryStore, IStore
-from lp.services.database.sqlbase import SQLBase, sqlvalues
-from lp.services.database.sqlobject import ForeignKey, StringCol
+from lp.services.database.stormbase import StormBase
 from lp.services.identity.interfaces.emailaddress import (
     EmailAddressAlreadyTaken,
     EmailAddressStatus,
@@ -41,15 +39,21 @@ class HasOwnerMixin:
 
 
 @implementer(IEmailAddress)
-class EmailAddress(SQLBase, HasOwnerMixin):
-    _table = "EmailAddress"
-    _defaultOrder = ["email"]
+class EmailAddress(StormBase, HasOwnerMixin):
+    __storm_table__ = "EmailAddress"
+    __storm_order__ = ["email"]
 
-    email = StringCol(
-        dbName="email", notNull=True, unique=True, alternateID=True
-    )
+    id = Int(primary=True)
+    email = Unicode(name="email", allow_none=False)
     status = DBEnum(name="status", enum=EmailAddressStatus, allow_none=False)
-    person = ForeignKey(dbName="person", foreignKey="Person", notNull=False)
+    person_id = Int(name="person", allow_none=True)
+    person = Reference(person_id, "Person.id")
+
+    def __init__(self, email, status, person=None):
+        super().__init__()
+        self.email = email
+        self.status = status
+        self.person = person
 
     def __repr__(self):
         return "<EmailAddress <%s> [%s]>" % (self.email, self.status)
@@ -83,7 +87,7 @@ class EmailAddress(SQLBase, HasOwnerMixin):
             MailingListSubscription, email_address=self
         ):
             store.remove(subscription)
-        super().destroySelf()
+        store.remove(self)
 
     @property
     def rdf_sha1(self):
@@ -99,18 +103,18 @@ class EmailAddress(SQLBase, HasOwnerMixin):
 class EmailAddressSet:
     def getByPerson(self, person):
         """See `IEmailAddressSet`."""
-        return EmailAddress.selectBy(person=person, orderBy="email")
+        return (
+            IStore(EmailAddress)
+            .find(EmailAddress, person=person)
+            .order_by(EmailAddress.email)
+        )
 
     def getPreferredEmailForPeople(self, people):
         """See `IEmailAddressSet`."""
-        return EmailAddress.select(
-            """
-            EmailAddress.status = %s AND
-            EmailAddress.person IN %s
-            """
-            % sqlvalues(
-                EmailAddressStatus.PREFERRED, [person.id for person in people]
-            )
+        return IStore(EmailAddress).find(
+            EmailAddress,
+            EmailAddress.status == EmailAddressStatus.PREFERRED,
+            EmailAddress.person_id.is_in([person.id for person in people]),
         )
 
     def getByEmail(self, email):
@@ -119,8 +123,7 @@ class EmailAddressSet:
             IStore(EmailAddress)
             .find(
                 EmailAddress,
-                Lower(EmailAddress.email)
-                == six.ensure_text(email).strip().lower(),
+                EmailAddress.email.lower() == email.strip().lower(),
             )
             .one()
         )
diff --git a/lib/lp/services/verification/browser/logintoken.py b/lib/lp/services/verification/browser/logintoken.py
index 8cb3b0c..7bdc469 100644
--- a/lib/lp/services/verification/browser/logintoken.py
+++ b/lib/lp/services/verification/browser/logintoken.py
@@ -426,7 +426,7 @@ class ValidateEmailView(BaseTokenView, LaunchpadFormView):
         emailset = getUtility(IEmailAddressSet)
         email = emailset.getByEmail(self.context.email)
         if email is not None:
-            if requester is None or email.personID != requester.id:
+            if requester is None or email.person != requester:
                 dupe = email.person
                 # Yes, hardcoding an autogenerated field name is an evil
                 # hack, but if it fails nothing will happen.
@@ -585,7 +585,7 @@ class MergePeopleView(BaseTokenView, LaunchpadFormView):
         # As a person can have at most one preferred email, ensure
         # that this new email does not have the PREFERRED status.
         email.status = EmailAddressStatus.NEW
-        email.personID = requester.id
+        email.person = requester
         requester.validateAndEnsurePreferredEmail(email)
 
         # Need to flush all changes we made, so subsequent queries we make
@@ -595,7 +595,7 @@ class MergePeopleView(BaseTokenView, LaunchpadFormView):
 
         # Now we must check if the dupe account still have registered email
         # addresses. If it hasn't we can actually do the merge.
-        if emailset.getByPerson(self.dupe):
+        if not emailset.getByPerson(self.dupe).is_empty():
             self.mergeCompleted = False
             return
         getUtility(IPersonSet).mergeAsync(
diff --git a/lib/lp/services/webapp/doc/webapp-publication.rst b/lib/lp/services/webapp/doc/webapp-publication.rst
index 2473f52..6a54055 100644
--- a/lib/lp/services/webapp/doc/webapp-publication.rst
+++ b/lib/lp/services/webapp/doc/webapp-publication.rst
@@ -1022,7 +1022,7 @@ be automatically reverted in a GET request.
     ...         IPrimaryStore(Person)
     ...         .find(
     ...             Person,
-    ...             Person.id == EmailAddress.personID,
+    ...             Person.id == EmailAddress.person_id,
     ...             EmailAddress.email == "[e-mail]",
     ...         )
     ...         .one()
diff --git a/lib/lp/soyuz/doc/gina-multiple-arch.rst b/lib/lp/soyuz/doc/gina-multiple-arch.rst
index e2d84b1..86b6820 100644
--- a/lib/lp/soyuz/doc/gina-multiple-arch.rst
+++ b/lib/lp/soyuz/doc/gina-multiple-arch.rst
@@ -23,7 +23,7 @@ Get the current counts of stuff in the database:
     >>> orig_tp_count = (
     ...     IStore(TeamParticipation).find(TeamParticipation).count()
     ... )
-    >>> orig_email_count = EmailAddress.select().count()
+    >>> orig_email_count = IStore(EmailAddress).find(EmailAddress).count()
     >>> orig_bpr_count = (
     ...     IStore(BinaryPackageRelease).find(BinaryPackageRelease).count()
     ... )
@@ -147,7 +147,9 @@ porridge):
     ...     - orig_tp_count
     ... )
     2
-    >>> print(EmailAddress.select().count() - orig_email_count)
+    >>> print(
+    ...     IStore(EmailAddress).find(EmailAddress).count() - orig_email_count
+    ... )
     2
 
 There are 4 binary packages generated by the two builds of the two
diff --git a/lib/lp/soyuz/doc/gina.rst b/lib/lp/soyuz/doc/gina.rst
index a934313..bea1206 100644
--- a/lib/lp/soyuz/doc/gina.rst
+++ b/lib/lp/soyuz/doc/gina.rst
@@ -30,7 +30,7 @@ Get the current counts of stuff in the database:
     >>> orig_tp_count = (
     ...     IStore(TeamParticipation).find(TeamParticipation).count()
     ... )
-    >>> orig_email_count = EmailAddress.select().count()
+    >>> orig_email_count = IStore(EmailAddress).find(EmailAddress).count()
     >>> orig_bpr_count = (
     ...     IStore(BinaryPackageRelease).find(BinaryPackageRelease).count()
     ... )
@@ -599,7 +599,9 @@ Kamion, 2 being uploaded by mdz and 2 by doko).
     ...     - orig_tp_count
     ... )
     13
-    >>> print(EmailAddress.select().count() - orig_email_count)
+    >>> print(
+    ...     IStore(EmailAddress).find(EmailAddress).count() - orig_email_count
+    ... )
     13
 
 
@@ -695,7 +697,9 @@ changed, etc.
     ...     - orig_tp_count
     ... )
     13
-    >>> print(EmailAddress.select().count() - orig_email_count)
+    >>> print(
+    ...     IStore(EmailAddress).find(EmailAddress).count() - orig_email_count
+    ... )
     13
     >>> (
     ...     IStore(BinaryPackageRelease).find(BinaryPackageRelease).count()
diff --git a/lib/lp/soyuz/model/archivesubscriber.py b/lib/lp/soyuz/model/archivesubscriber.py
index d57cf23..0ff0cc7 100644
--- a/lib/lp/soyuz/model/archivesubscriber.py
+++ b/lib/lp/soyuz/model/archivesubscriber.py
@@ -116,7 +116,7 @@ class ArchiveSubscriber(StormBase):
 
             # Only return people with preferred email address set.
             preferred_email = Join(
-                EmailAddress, EmailAddress.personID == Person.id
+                EmailAddress, EmailAddress.person_id == Person.id
             )
 
             # We want to get all participants who are themselves
@@ -151,7 +151,7 @@ class ArchiveSubscriber(StormBase):
             return store.find(
                 (Person, EmailAddress),
                 Person.id == self.subscriber_id,
-                EmailAddress.personID == Person.id,
+                EmailAddress.person_id == Person.id,
                 EmailAddress.status == EmailAddressStatus.PREFERRED,
             )
 
diff --git a/lib/lp/soyuz/tests/test_doc.py b/lib/lp/soyuz/tests/test_doc.py
index f316ab8..936370b 100644
--- a/lib/lp/soyuz/tests/test_doc.py
+++ b/lib/lp/soyuz/tests/test_doc.py
@@ -12,6 +12,9 @@ import unittest
 import transaction
 
 from lp.services.config import config
+from lp.services.database.interfaces import IStore
+from lp.services.identity.interfaces.emailaddress import EmailAddressStatus
+from lp.services.identity.model.emailaddress import EmailAddress
 from lp.testing import logout
 from lp.testing.dbuser import switch_dbuser
 from lp.testing.layers import LaunchpadFunctionalLayer, LaunchpadZopelessLayer
@@ -35,11 +38,10 @@ def lobotomize_stevea():
     code that did not use the ValidPersonOrTeamCache to determine
     validity.
     """
-    from lp.services.identity.interfaces.emailaddress import EmailAddressStatus
-    from lp.services.identity.model.emailaddress import EmailAddress
-
-    stevea_emailaddress = EmailAddress.byEmail(
-        "[e-mail]"
+    stevea_emailaddress = (
+        IStore(EmailAddress)
+        .find(EmailAddress, email="[e-mail]")
+        .one()
     )
     stevea_emailaddress.status = EmailAddressStatus.NEW
     transaction.commit()