Merge branch 'develop'

Author: manfred-kaiser

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="sifter3",
-    version="0.2.2",
+    version="0.2.3",
     author="Manfred Kaiser, Gary Peck",
     author_email="manfred.kaiser@logfile.at, gary@realify.com",
     url="https://sifter3.readthedocs.io/en/latest/",

sifter/commands/reject.py

@@ -17,7 +17,7 @@ class CommandReject(Command):
     POSITIONAL_ARGS = [StringList()]
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
-        print(self.positional_args[0][0])
-        state.actions.append('reject', self.positional_args[0][0])
+        reject_message = self.positional_args[0][0]  # type: ignore
+        state.actions.append('reject', reject_message)
         state.actions.cancel_implicit_keep()
         return None

sifter/grammar/lexer.py

@@ -1,6 +1,7 @@
 # Parser based on RFC 5228, especially the grammar as defined in section 8. All
 # references are to sections in RFC 5228 unless stated otherwise.
 
+import re
 from typing import (
     Any,
     Optional,
@@ -69,6 +70,7 @@ def t_MULTILINE_STRING(self, t: 'LexToken') -> Optional['LexToken']:
         # potentially ambiguous, scripts SHOULD be properly dot-stuffed so such
         # lines do not appear.
         t.value = t.lexer.lexmatch.group('multilinetext')
+        t.value = re.sub(r'(\r?\n\.)\.', r'\1', t.value)
         return t
 
     # section 2.4.2

tests/test_evaluation.py

@@ -25,7 +25,7 @@ def test_evaulation():
         ("evaluation_3.msg", "evaluation_2.rules", [('fileinto', ['INBOX'])]),
         ("evaluation_3.msg", "evaluation_3.rules", [('keep', None)]),
         ("evaluation_1.msg", "evaluation_4.rules", [('reject', 'I do not accept messages from this address.')]),
-        ("evaluation_1.msg", "evaluation_5.rules", [('reject', 'I do not accept messages from\nthis address.\n..\n')]),
+        ("evaluation_1.msg", "evaluation_5.rules", [('reject', 'I do not accept messages from\nthis address.\n.\n')]),
     )
 
     for messagefile, rulefile, evaluated_rules in EVAL_RESULTS: