7 files changed, 12 insertions, 10 deletions

diff --git a/src/mailman_pgp/model/base.py b/src/mailman_pgp/model/base.py
index 2ccc7e5..646bb7d 100644
--- a/src/mailman_pgp/model/base.py
+++ b/src/mailman_pgp/model/base.py
@@ -27,8 +27,9 @@ from mailman_pgp.database import query
 @as_declarative()
 class Base:
 
-    def query(self):
-        return query(self.__class__)
+    @classmethod
+    def query(cls):
+        return query(cls)
 
 
 from mailman_pgp.model.address import PGPAddress # noqa
diff --git a/src/mailman_pgp/plugin.py b/src/mailman_pgp/plugin.py
index 95006f8..6c4a0d7 100644
--- a/src/mailman_pgp/plugin.py
+++ b/src/mailman_pgp/plugin.py
@@ -52,7 +52,7 @@ class PGPMailman:
 
 @classhandler.handler(ListDeletedEvent)
 def on_delete(mlist):
-    encrypted_list = query(PGPMailingList).filter_by(
+    encrypted_list = PGPMailingList.query().filter_by(
         list_id=mlist.list_id).first()
     if encrypted_list:
         with transaction() as session:
diff --git a/src/mailman_pgp/rest/lists.py b/src/mailman_pgp/rest/lists.py
index 0853a35..5279702 100644
--- a/src/mailman_pgp/rest/lists.py
+++ b/src/mailman_pgp/rest/lists.py
@@ -44,7 +44,7 @@ class _EncryptedBase(CollectionMixin):
 
     def _get_collection(self, request):
         """See `CollectionMixin`."""
-        return query(PGPMailingList).all()
+        return PGPMailingList.query().all()
 
 
 @public
@@ -58,7 +58,7 @@ class AllEncryptedLists(_EncryptedBase):
 @public
 class AnEncryptedList(_EncryptedBase):
     def __init__(self, list_id):
-        self._mlist = query(PGPMailingList).filter_by(
+        self._mlist = PGPMailingList.query().filter_by(
             list_id=list_id).first()
 
     def on_get(self, request, response):
diff --git a/src/mailman_pgp/rules/signature.py b/src/mailman_pgp/rules/signature.py
index 27544a2..5a89ab1 100644
--- a/src/mailman_pgp/rules/signature.py
+++ b/src/mailman_pgp/rules/signature.py
@@ -54,6 +54,7 @@ class Signature:
             list_id=mlist.list_id).first()
         if enc_list is None:
             raise ValueError('PGP enabled mailing list not found.')
+
         wrapped = PGPWrapper(msg)
 
         if not wrapped.is_signed():
diff --git a/src/mailman_pgp/runners/incoming.py b/src/mailman_pgp/runners/incoming.py
index 1c602b1..e059c28 100644
--- a/src/mailman_pgp/runners/incoming.py
+++ b/src/mailman_pgp/runners/incoming.py
@@ -35,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 = query(PGPMailingList).filter_by(
+        encrypted_list = PGPMailingList.query().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 0fc9378..92a765d 100644
--- a/src/mailman_pgp/runners/outgoing.py
+++ b/src/mailman_pgp/runners/outgoing.py
@@ -32,7 +32,7 @@ from mailman_pgp.model.list import PGPMailingList
 class OutgoingRunner(Runner):
     def _dispose(self, mlist: MailingList, msg: Message, msgdata: dict):
         """See `IRunner`."""
-        encrypted_list = query(PGPMailingList).filter_by(
+        encrypted_list = PGPMailingList.query().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 c0f70f4..ac3b61a 100644
--- a/src/mailman_pgp/styles/base.py
+++ b/src/mailman_pgp/styles/base.py
@@ -30,12 +30,12 @@ class EncryptedStyle:
         """Creates the encrypted mailing list instance for the list it's
         applied to.
         """
-        enc_list = query(PGPMailingList).filter_by(
+        enc_list = PGPMailingList.query().filter_by(
             list_id=mailing_list.list_id).first()
         if enc_list:
             return
 
         enc_list = PGPMailingList(mailing_list)
-        with transaction():
-            config.db.session.add(enc_list)
+        with transaction() as t:
+            t.add(enc_list)
         mailing_list.posting_chain = 'pgp-posting-chain'