Use the query helper.

4 files changed, 9 insertions, 6 deletions

diff --git a/src/mailman_pgp/rest/lists.py b/src/mailman_pgp/rest/lists.py
index 8f4cf8b..18669ad 100644
--- a/src/mailman_pgp/rest/lists.py
+++ b/src/mailman_pgp/rest/lists.py
@@ -22,6 +22,7 @@ from mailman.rest.helpers import (
 from public import public
 
 from mailman_pgp.config import config
+from mailman_pgp.database import query
 from mailman_pgp.model.list import EncryptedMailingList
 
 
@@ -39,7 +40,7 @@ class _EncryptedBase(CollectionMixin):
 
     def _get_collection(self, request):
         """See `CollectionMixin`."""
-        return config.db.session.query(EncryptedMailingList).all()
+        return query(EncryptedMailingList).all()
 
 
 @public
@@ -53,7 +54,7 @@ class AllEncryptedLists(_EncryptedBase):
 @public
 class AnEncryptedList(_EncryptedBase):
     def __init__(self, list_id):
-        self._mlist = config.db.session.query(EncryptedMailingList).filter_by(
+        self._mlist = query(EncryptedMailingList).filter_by(
             list_id=list_id).first()
 
     def on_get(self, request, response):
diff --git a/src/mailman_pgp/runners/incoming.py b/src/mailman_pgp/runners/incoming.py
index d59b1a5..1dbf8c9 100644
--- a/src/mailman_pgp/runners/incoming.py
+++ b/src/mailman_pgp/runners/incoming.py
@@ -24,6 +24,7 @@ from mailman.model.mailinglist import MailingList
 from public import public
 
 from mailman_pgp.config import config
+from mailman_pgp.database import query
 from mailman_pgp.model.list import EncryptedMailingList
 from mailman_pgp.pgp.wrapper import PGPWrapper
 
@@ -34,7 +35,7 @@ class IncomingRunner(Runner):
         """See `IRunner`."""
         # Is the message for an encrypted mailing list? If not, pass to default
         # incoming runner. If yes, go on.
-        encrypted_list = config.db.query(EncryptedMailingList).filter_by(
+        encrypted_list = query(EncryptedMailingList).filter_by(
             list_id=mlist.list_id).first()
         if not encrypted_list:
             inq = config.get('queues', 'in')
diff --git a/src/mailman_pgp/runners/outgoing.py b/src/mailman_pgp/runners/outgoing.py
index 3b2f97d..e566769 100644
--- a/src/mailman_pgp/runners/outgoing.py
+++ b/src/mailman_pgp/runners/outgoing.py
@@ -24,6 +24,7 @@ from mailman.model.mailinglist import MailingList
 from public import public
 
 from mailman_pgp.config import config
+from mailman_pgp.database import query
 from mailman_pgp.model.list import EncryptedMailingList
 
 
@@ -31,7 +32,7 @@ from mailman_pgp.model.list import EncryptedMailingList
 class OutgoingRunner(Runner):
     def _dispose(self, mlist: MailingList, msg: Message, msgdata: dict):
         """See `IRunner`."""
-        encrypted_list = config.db.query(EncryptedMailingList).filter_by(
+        encrypted_list = query(EncryptedMailingList).filter_by(
             list_id=mlist.list_id).first()
         if not encrypted_list:
             outq = config.get('queues', 'out')
diff --git a/src/mailman_pgp/styles/base.py b/src/mailman_pgp/styles/base.py
index f08674c..e78ce97 100644
--- a/src/mailman_pgp/styles/base.py
+++ b/src/mailman_pgp/styles/base.py
@@ -20,7 +20,7 @@
 from public import public
 
 from mailman_pgp.config import config
-from mailman_pgp.database import transaction
+from mailman_pgp.database import query, transaction
 from mailman_pgp.model.list import EncryptedMailingList
 
 
@@ -30,7 +30,7 @@ class EncryptedStyle:
         """Creates the encrypted mailing list instance for the list it's
         applied to.
         """
-        enc_list = config.db.session.query(EncryptedMailingList).filter_by(
+        enc_list = query(EncryptedMailingList).filter_by(
             list_id=mailing_list.list_id).first()
         if enc_list:
             return