[incubator-ponymail-foal] branch master updated: Rename policy property to agree with actual name

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
     new 0c37766  Rename policy property to agree with actual name
0c37766 is described below

commit 0c37766d051b2d99116a314f60887cdf107164b9
Author: Sebb <s...@apache.org>
AuthorDate: Sun Nov 28 00:03:46 2021 +0000

    Rename policy property to agree with actual name
    
    It is misleading to use 'strict' as the policy is not strict in terms
    of RFC compliance, only that it is compliant in terms of the original
    behaviour.
---
 tools/archiver.py           | 2 +-
 tools/archiver.yaml.example | 2 +-
 tools/setup.py              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 5211bc7..6d3c99c 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -96,7 +96,7 @@ aURL = config.get("archiver", "baseurl")
 # (may be used by import-mbox)
 policy_choice = config.get("archiver", "policy", fallback="default")
 policy: typing.Any
-if policy_choice == "strict":
+if policy_choice == "compat32":
     policy = email.policy.compat32   # 7bit lines
 elif policy_choice == "smtputf8":
     policy = email.policy.SMTPUTF8   # 8bit/unicode lines
diff --git a/tools/archiver.yaml.example b/tools/archiver.yaml.example
index b740b22..398d1e7 100644
--- a/tools/archiver.yaml.example
+++ b/tools/archiver.yaml.example
@@ -38,7 +38,7 @@ archiver:
     #generator:             full|dkim|other (dkim recommended)
     generator:              dkim
     # nonce:                optional secret salt ('pepper')
-    policy:                 default   # message parsing policy: default, 
strict, smtputf8
+    policy:                 default   # message parsing policy: default, 
compat32, smtputf8
 
 debug:
     #cropout:               string to crop from list-id
diff --git a/tools/setup.py b/tools/setup.py
index 540ece4..eaf99ad 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -386,7 +386,7 @@ archiver:
     #generator:             dkim|full (dkim recommended)
     generator:              %s
     nonce:                  %s
-    policy:                 default   # message parsing policy: default, 
strict, smtputf8
+    policy:                 default   # message parsing policy: default, 
compat32, smtputf8
 
 debug:
     #cropout:               string to crop from list-id