7 files changed, 25 insertions, 23 deletions

diff --git a/src/mailman_pgp/config/mailman_pgp.cfg b/src/mailman_pgp/config/mailman_pgp.cfg
index ab0b7d9..ad11407 100644
--- a/src/mailman_pgp/config/mailman_pgp.cfg
+++ b/src/mailman_pgp/config/mailman_pgp.cfg
@@ -50,6 +50,8 @@ subkey_type = RSA
 
 
 [queues]
+# The queue to which processed incoming messages are passed.
 in = in_default
 
+# The queue to which processed outgoing messages are passed.
 out = out_default
\ No newline at end of file
diff --git a/src/mailman_pgp/plugin.py b/src/mailman_pgp/plugin.py
index d3974d1..2a8207c 100644
--- a/src/mailman_pgp/plugin.py
+++ b/src/mailman_pgp/plugin.py
@@ -52,9 +52,9 @@ class PGPMailman:
 
 @classhandler.handler(ListDeletedEvent)
 def on_delete(mlist):
-    encrypted_list = PGPMailingList.query().filter_by(
+    pgp_list = PGPMailingList.query().filter_by(
         list_id=mlist.list_id).first()
-    if encrypted_list:
+    if pgp_list:
         with transaction() as session:
             # TODO shred the list key
-            session.delete(encrypted_list)
+            session.delete(pgp_list)
diff --git a/src/mailman_pgp/runners/incoming.py b/src/mailman_pgp/runners/incoming.py
index 6337633..5d55780 100644
--- a/src/mailman_pgp/runners/incoming.py
+++ b/src/mailman_pgp/runners/incoming.py
@@ -34,9 +34,9 @@ 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 = PGPMailingList.query().filter_by(
+        pgp_list = PGPMailingList.query().filter_by(
             list_id=mlist.list_id).first()
-        if not encrypted_list:
+        if not pgp_list:
             inq = config.get('queues', 'in')
             mailman_config.switchboards[inq].enqueue(msg, msgdata,
                                                      listid=mlist.list_id)
diff --git a/src/mailman_pgp/runners/outgoing.py b/src/mailman_pgp/runners/outgoing.py
index 646822b..89125a7 100644
--- a/src/mailman_pgp/runners/outgoing.py
+++ b/src/mailman_pgp/runners/outgoing.py
@@ -31,9 +31,9 @@ from mailman_pgp.model.list import PGPMailingList
 class OutgoingRunner(Runner):
     def _dispose(self, mlist: MailingList, msg: Message, msgdata: dict):
         """See `IRunner`."""
-        encrypted_list = PGPMailingList.query().filter_by(
+        pgp_list = PGPMailingList.query().filter_by(
             list_id=mlist.list_id).first()
-        if not encrypted_list:
+        if not pgp_list:
             outq = config.get('queues', 'out')
             mailman_config.switchboards[outq].enqueue(msg,
                                                       msgdata,
diff --git a/src/mailman_pgp/styles/announce.py b/src/mailman_pgp/styles/announce.py
index abeef81..c2939c1 100644
--- a/src/mailman_pgp/styles/announce.py
+++ b/src/mailman_pgp/styles/announce.py
@@ -20,15 +20,15 @@
 from mailman.styles.default import LegacyAnnounceOnly
 from public import public
 
-from mailman_pgp.styles.base import EncryptedStyle
+from mailman_pgp.styles.base import PGPStyle
 
 
 @public
-class AnnounceStyle(LegacyAnnounceOnly, EncryptedStyle):
-    name = 'encrypted-announce'
-    description = 'Announce only encrypted mailing list style.'
+class AnnounceStyle(LegacyAnnounceOnly, PGPStyle):
+    name = 'pgp-announce'
+    description = 'Announce only PGP enabled mailing list style.'
 
     def apply(self, mailing_list):
         """See `IStyle`."""
         LegacyAnnounceOnly.apply(self, mailing_list)
-        EncryptedStyle.apply(self, mailing_list)
+        PGPStyle.apply(self, mailing_list)
diff --git a/src/mailman_pgp/styles/base.py b/src/mailman_pgp/styles/base.py
index 10d9c18..dd8e76b 100644
--- a/src/mailman_pgp/styles/base.py
+++ b/src/mailman_pgp/styles/base.py
@@ -24,17 +24,17 @@ from mailman_pgp.model.list import PGPMailingList
 
 
 @public
-class EncryptedStyle:
+class PGPStyle:
     def apply(self, mailing_list):
         """Creates the encrypted mailing list instance for the list it's
         applied to.
         """
-        enc_list = PGPMailingList.query().filter_by(
+        pgp_list = PGPMailingList.query().filter_by(
             list_id=mailing_list.list_id).first()
-        if enc_list:
+        if pgp_list:
             return
 
-        enc_list = PGPMailingList(mailing_list)
-        with transaction() as t:
-            t.add(enc_list)
+        pgp_list = PGPMailingList(mailing_list)
+        with transaction() as session:
+            session.add(pgp_list)
         mailing_list.posting_chain = 'pgp-posting-chain'
diff --git a/src/mailman_pgp/styles/discussion.py b/src/mailman_pgp/styles/discussion.py
index 4836f4e..ec0fdc4 100644
--- a/src/mailman_pgp/styles/discussion.py
+++ b/src/mailman_pgp/styles/discussion.py
@@ -20,15 +20,15 @@
 from mailman.styles.default import LegacyDefaultStyle
 from public import public
 
-from mailman_pgp.styles.base import EncryptedStyle
+from mailman_pgp.styles.base import PGPStyle
 
 
 @public
-class DiscussionStyle(LegacyDefaultStyle, EncryptedStyle):
-    name = 'encrypted-default'
-    description = 'Ordinary discussion encrypted mailing list style.'
+class DiscussionStyle(LegacyDefaultStyle, PGPStyle):
+    name = 'pgp-default'
+    description = 'Ordinary discussion PGP enabled mailing list style.'
 
     def apply(self, mailing_list):
         """See `IStyle`."""
         LegacyDefaultStyle.apply(self, mailing_list)
-        EncryptedStyle.apply(self, mailing_list)
+        PGPStyle.apply(self, mailing_list)