Merge branch 'develop'

Author: manfred-kaiser

README.md

@@ -18,7 +18,8 @@ FEATURES
 
 -   Supports all of the base Sieve spec from RFC 5228, except for
     features still listed under TODO below
-    - multiline strings (since version 0.2.2)
+    -   multiline strings (since version 0.2.2)
+    -   bracketed comments (since version 0.2.4)
 -   Extensions supported:
     -   regex (draft-ietf-sieve-regex-01)
     -   body (RFC 5173)
@@ -72,7 +73,6 @@ TODO
 -   Base spec features not yet implemented:
     -   encoded characters (section 2.4.2.4)
     -   multi-line strings (section 2.4.2)
-    -   bracketed comments (section 2.3)
     -   message uniqueness (section 2.10.3)
     -   envelope test (section 5.4)
     -   handle message loops (section 10)

docs/index.rst

@@ -11,6 +11,7 @@ FEATURES
     features still listed under TODO below
 
     - multiline strings (since version 0.2.2)
+    - bracketed comments (since version 0.2.4)
 
 -   Extensions supported:
 
@@ -76,7 +77,6 @@ TODO
 -   Base spec features not yet implemented:
 
     -   encoded characters (section 2.4.2.4)
-    -   bracketed comments (section 2.3)
     -   message uniqueness (section 2.10.3)
     -   envelope test (section 5.4)
     -   handle message loops (section 10)

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="sifter3",
-    version="0.2.3",
+    version="0.2.4",
     author="Manfred Kaiser, Gary Peck",
     author_email="manfred.kaiser@logfile.at, gary@realify.com",
     url="https://sifter3.readthedocs.io/en/latest/",
@@ -61,6 +61,7 @@
             'notify = sifter.commands.notify:CommandNotify',
             'redirect = sifter.commands.redirect:CommandRedirect',
             'reject = sifter.commands.reject:CommandReject',
+            'ereject = sifter.commands.reject:CommandEReject',
             'require = sifter.commands.require:CommandRequire',
             'set = sifter.commands.variables:CommandSet',
             'stop = sifter.commands.stop:CommandStop',

sifter/commands/discard.py

@@ -11,7 +11,7 @@
 # section 4.4
 class CommandDiscard(Command):
 
-    RULE_IDENTIFIER = 'DISCARD'
+    HANDLER_ID = 'DISCARD'
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
         state.actions.cancel_implicit_keep()

sifter/commands/fileinto.py

@@ -13,7 +13,8 @@
 # section 4.1
 class CommandFileInto(Command):
 
-    RULE_IDENTIFIER = 'FILEINTO'
+    HANDLER_ID = 'FILEINTO'
+    EXTENSION_NAME = 'fileinto'
     POSITIONAL_ARGS = [StringList(length=1)]
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/if_cmd.py

@@ -25,12 +25,12 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
 
 class CommandIf(CommandIfBase):
 
-    RULE_IDENTIFIER = 'IF'
+    HANDLER_ID = 'IF'
 
 
 class CommandElsIf(CommandIfBase):
 
-    RULE_IDENTIFIER = 'ELSIF'
+    HANDLER_ID = 'ELSIF'
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
         if state.last_if:
@@ -40,7 +40,7 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
 
 class CommandElse(Command):
 
-    RULE_IDENTIFIER = 'ELSE'
+    HANDLER_ID = 'ELSE'
     TESTS_MIN = 0
     HAS_BLOCKS = False
 

sifter/commands/imap4flags.py

@@ -15,7 +15,8 @@
 
 class CommandSetFlag(Command):
 
-    RULE_IDENTIFIER = 'SETFLAG'
+    HANDLER_ID = 'SETFLAG'
+    EXTENSION_NAME = 'imap4flags'
     POSITIONAL_ARGS = [StringList()]
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
@@ -28,7 +29,8 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
 
 class CommandRemoveFlag(Command):
 
-    RULE_IDENTIFIER = 'REMOVEFLAG'
+    HANDLER_ID = 'REMOVEFLAG'
+    EXTENSION_NAME = 'imap4flags'
     POSITIONAL_ARGS = [StringList()]
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
@@ -41,7 +43,8 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
 
 class CommandAddFlag(Command):
 
-    RULE_IDENTIFIER = 'ADDFLAG'
+    HANDLER_ID = 'ADDFLAG'
+    EXTENSION_NAME = 'imap4flags'
     POSITIONAL_ARGS = [StringList()]
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/keep.py

@@ -11,7 +11,7 @@
 # section 4.3
 class CommandKeep(Command):
 
-    RULE_IDENTIFIER = 'KEEP'
+    HANDLER_ID = 'KEEP'
     HAS_BLOCKS = False
 
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/notify.py

@@ -15,7 +15,8 @@
 # RFC 5435
 class CommandNotify(Command):
 
-    RULE_IDENTIFIER = 'NOTIFY'
+    HANDLER_ID = 'NOTIFY'
+    EXTENSION_NAME = 'enotify'
     TAGGED_ARGS = {
         'from': Tag('FROM', (StringList(1),)),
         'importance': Tag('IMPORTANCE', (StringList(1),)),

sifter/commands/redirect.py

@@ -26,7 +26,7 @@
 # section 4.2
 class CommandRedirect(Command):
 
-    RULE_IDENTIFIER = 'REDIRECT'
+    HANDLER_ID = 'REDIRECT'
     POSITIONAL_ARGS = [StringList(length=1)]
 
     def __init__(