fixed some type hints

Author: manfred-kaiser

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="sifter3",
-    version="0.2.5",
+    version="0.2.6",
     author="Manfred Kaiser, Gary Peck",
     author_email="[email protected], [email protected]",
     url="https://sifter3.readthedocs.io/en/latest/",

sifter/commands/discard.py

@@ -1,9 +1,5 @@
 from email.message import Message
-from typing import (
-    Optional
-)
 
-from sifter.grammar.actions import Actions
 from sifter.grammar.state import EvaluationState
 from sifter.grammar.command import Command
 
@@ -13,6 +9,5 @@ class CommandDiscard(Command):
 
     HANDLER_ID = 'DISCARD'
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.actions.cancel_implicit_keep()
-        return None

sifter/commands/fileinto.py

@@ -1,13 +1,9 @@
 from email.message import Message
-from typing import (
-    Optional
-)
 
 from sifter.grammar.command import Command
 from sifter.grammar.string import expand_variables
 from sifter.validators.stringlist import StringList
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 
 # section 4.1
@@ -17,12 +13,11 @@ class CommandFileInto(Command):
     EXTENSION_NAME = 'fileinto'
     POSITIONAL_ARGS = [StringList(length=1)]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.check_required_extension('fileinto', 'FILEINTO')
 
         file_dest = self.positional_args[0]
         file_dest = list(map(lambda s: expand_variables(s, state), file_dest))  # type: ignore
 
         state.actions.append('fileinto', file_dest)
         state.actions.cancel_implicit_keep()
-        return None

sifter/commands/imap4flags.py

@@ -1,11 +1,9 @@
 from email.message import Message
-from typing import Optional
 
 from sifter.grammar.command import Command
 from sifter.validators.stringlist import StringList
 from sifter.grammar.string import expand_variables
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 # This implements the RFC5232 imap4flags extension
 # commands: addflag, removeflag, setflag
@@ -19,12 +17,11 @@ class CommandSetFlag(Command):
     EXTENSION_NAME = 'imap4flags'
     POSITIONAL_ARGS = [StringList()]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.check_required_extension('imap4flags', 'imapflags')
         flag_list = self.positional_args[0]
         flag_list = list(map(lambda s: expand_variables(s, state), flag_list))  # type: ignore
         state.actions.append('setflag', flag_list)
-        return None
 
 
 class CommandRemoveFlag(Command):
@@ -33,12 +30,11 @@ class CommandRemoveFlag(Command):
     EXTENSION_NAME = 'imap4flags'
     POSITIONAL_ARGS = [StringList()]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.check_required_extension('imap4flags', 'imapflags')
         flag_list = self.positional_args[0]
         flag_list = list(map(lambda s: expand_variables(s, state), flag_list))  # type: ignore
         state.actions.append('removeflag', flag_list)
-        return None
 
 
 class CommandAddFlag(Command):
@@ -47,9 +43,8 @@ class CommandAddFlag(Command):
     EXTENSION_NAME = 'imap4flags'
     POSITIONAL_ARGS = [StringList()]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.check_required_extension('imap4flags', 'imapflags')
         flag_list = self.positional_args[0]
         flag_list = list(map(lambda s: expand_variables(s, state), flag_list))  # type: ignore
         state.actions.append('addflag', flag_list)
-        return None

sifter/commands/keep.py

@@ -1,11 +1,7 @@
 from email.message import Message
-from typing import (
-    Optional
-)
 
 from sifter.grammar.command import Command
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 
 # section 4.3
@@ -14,7 +10,6 @@ class CommandKeep(Command):
     HANDLER_ID = 'KEEP'
     HAS_BLOCKS = False
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.actions.append('keep')
         state.actions.cancel_implicit_keep()
-        return None

sifter/commands/notify.py

@@ -1,6 +1,5 @@
 import re
 from email.message import Message
-from typing import Optional
 
 from sifter.grammar.command import Command
 from sifter.grammar.string import expand_variables
@@ -9,7 +8,6 @@
 from sifter.grammar.rule import RuleSyntaxError
 from sifter.extensions import ExtensionRegistry
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 
 # RFC 5435
@@ -27,7 +25,7 @@ class CommandNotify(Command):
         StringList(length=1)
     ]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         notify_from = notify_importance = self.notify_message = None
         notify_options = []  # type: ignore
         if 'from' in self.tagged_args:
@@ -64,5 +62,3 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
             'notify',
             (notify_method, notify_from, notify_importance, notify_options, notify_message)  # type: ignore
         )
-
-        return None

sifter/commands/redirect.py

@@ -14,7 +14,6 @@
 from sifter.grammar.rule import RuleSyntaxError
 from sifter.validators.stringlist import StringList
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 from sifter.grammar.string import expand_variables
 
 if TYPE_CHECKING:
@@ -49,8 +48,7 @@ def __init__(
                 % self.email_address
             )
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         email_address = expand_variables(self.email_address, state)
         state.actions.append('redirect', email_address)
         state.actions.cancel_implicit_keep()
-        return None

sifter/commands/reject.py

@@ -1,13 +1,11 @@
 from email.message import Message
 from typing import (
-    Text,
-    Optional
+    Text
 )
 
 from sifter.grammar.command import Command
 from sifter.validators.stringlist import StringList
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 
 # section 3.2
@@ -17,11 +15,10 @@ class CommandReject(Command):
     EXTENSION_NAME = 'reject'
     POSITIONAL_ARGS = [StringList()]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         reject_message = self.positional_args[0][0]  # type: ignore
         state.actions.append('reject', reject_message)
         state.actions.cancel_implicit_keep()
-        return None
 
 
 class CommandEReject(CommandReject):

sifter/commands/require.py

@@ -1,14 +1,12 @@
 from email.message import Message
 from typing import (
-    Text,
-    Optional
+    Text
 )
 
 from sifter.grammar.command import Command
 from sifter.extensions import ExtensionRegistry
 from sifter.validators.stringlist import StringList
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 
 # section 3.2
@@ -17,7 +15,7 @@ class CommandRequire(Command):
     HANDLER_ID: Text = 'REQUIRE'
     POSITIONAL_ARGS = [StringList()]
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         ext_name_list = self.positional_args[0]
         for ext_name in ext_name_list:  # type: ignore
             if not ExtensionRegistry.has_extension(ext_name):
@@ -26,4 +24,3 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
                     % ext_name
                 )
             state.require_extension(ext_name)
-        return None

sifter/commands/stop.py

@@ -1,18 +1,13 @@
 from email.message import Message
-from typing import (
-    Optional
-)
 
 from sifter.grammar.command import Command
 from sifter.grammar.state import EvaluationState
-from sifter.grammar.actions import Actions
 
 
 # section 3.3
 class CommandStop(Command):
 
     HANDLER_ID = 'STOP'
 
-    def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+    def evaluate(self, message: Message, state: EvaluationState) -> None:
         state.actions.append('stop')
-        return None