Rename the rest, s/encrypted/PGP[ enabled]/g.

3 files changed, 16 insertions, 16 deletions

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)