removed __init__ methods from tests and commands

Author: manfred-kaiser

sifter/commands/fileinto.py

@@ -1,43 +1,25 @@
 from email.message import Message
 from typing import (
-    TYPE_CHECKING,
-    List,
-    Optional,
-    Union,
-    SupportsInt,
-    Text
+    Optional
 )
 
 from sifter.grammar.command import Command
-from sifter.grammar.command_list import CommandList
 from sifter.validators.stringlist import StringList
 from sifter.grammar.state import EvaluationState
 from sifter.grammar.actions import Actions
 
-if TYPE_CHECKING:
-    from sifter.grammar.tag import Tag as TagGrammar
-    from sifter.grammar.string import String
-    from sifter.grammar.test import Test
-
 
 # section 4.1
 class CommandFileInto(Command):
 
     RULE_IDENTIFIER = 'FILEINTO'
     POSITIONAL_ARGS = [StringList(length=1)]
 
-    def __init__(
-        self,
-        arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
-        tests: Optional[List['Test']] = None,
-        block: Optional[CommandList] = None
-    ) -> None:
-        super().__init__(arguments, tests, block)
-        self.file_dest = self.positional_args[0]
-
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
+        file_dest = self.positional_args[0]
+
         state.check_required_extension('fileinto', 'FILEINTO')
-        state.actions.append('fileinto', self.file_dest)  # type: ignore
+        state.actions.append('fileinto', file_dest)  # type: ignore
         state.actions.cancel_implicit_keep()
         return None
 

sifter/commands/if_cmd.py

@@ -1,23 +1,12 @@
 from email.message import Message
 from typing import (
-    TYPE_CHECKING,
-    List,
-    Optional,
-    Union,
-    SupportsInt,
-    Text
+    Optional
 )
 
 from sifter.grammar.command import Command
-from sifter.grammar.command_list import CommandList
 from sifter.grammar.state import EvaluationState
 from sifter.grammar.actions import Actions
 
-if TYPE_CHECKING:
-    from sifter.grammar.tag import Tag as TagGrammar
-    from sifter.grammar.string import String
-    from sifter.grammar.test import Test
-
 
 # section 3.1
 class CommandIfBase(Command):
@@ -61,14 +50,6 @@ class CommandElse(Command):
     TESTS_MIN = 0
     HAS_BLOCKS = False
 
-    def __init__(
-        self,
-        arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
-        tests: Optional[List['Test']] = None,
-        block: Optional[CommandList] = None
-    ) -> None:
-        super().__init__(arguments, tests, block)
-
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
         if state.last_if:
             return None

sifter/commands/require.py

@@ -1,44 +1,26 @@
 from email.message import Message
 from typing import (
-    TYPE_CHECKING,
     Text,
-    List,
-    Optional,
-    Union,
-    SupportsInt
+    Optional
 )
 
 from sifter.grammar.command import Command
-from sifter.grammar.command_list import CommandList
 import sifter.grammar
 import sifter.handler
 from sifter.validators.stringlist import StringList
 from sifter.grammar.state import EvaluationState
 from sifter.grammar.actions import Actions
 
-if TYPE_CHECKING:
-    from sifter.grammar.tag import Tag as TagGrammar
-    from sifter.grammar.string import String
-    from sifter.grammar.test import Test
-
 
 # section 3.2
 class CommandRequire(Command):
 
     RULE_IDENTIFIER: Text = 'REQUIRE'
     POSITIONAL_ARGS = [StringList()]
 
-    def __init__(
-        self,
-        arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
-        tests: Optional[List['Test']] = None,
-        block: Optional[CommandList] = None
-    ) -> None:
-        super().__init__(arguments, tests, block)
-        self.ext_names = self.positional_args[0]
-
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
-        for ext_name in self.ext_names:
+        ext_name_list = self.positional_args[0]
+        for ext_name in ext_name_list:
             if not sifter.handler.get('extension', ext_name):
                 raise RuntimeError(
                     "Required extension '%s' not supported"

sifter/tests/exists.py

@@ -1,39 +1,23 @@
 from email.message import Message
 from typing import (
-    TYPE_CHECKING,
-    List,
-    Optional,
-    SupportsInt,
-    Text,
-    Union
+    Optional
 )
 
 
 from sifter.grammar.state import EvaluationState
 from sifter.grammar.test import Test
 from sifter.validators.stringlist import StringList
 
-if TYPE_CHECKING:
-    from sifter.grammar.tag import Tag as TagGrammar
-    from sifter.grammar.string import String
-
 
 # section 5.9
 class TestExists(Test):
 
     RULE_IDENTIFIER = 'EXISTS'
     POSITIONAL_ARGS = [StringList()]
 
-    def __init__(
-        self,
-        arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
-        tests: Optional[List['Test']] = None
-    ) -> None:
-        super().__init__(arguments, tests)
-        self.headers = self.positional_args[0]
-
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[bool]:
-        if not isinstance(self.headers, list):
+        headers = self.positional_args[0]
+        if not isinstance(headers, list):
             raise ValueError("TestExists.headers must be a list")
         for header in self.headers:
             if header not in message:

sifter/tests/size.py

@@ -1,26 +1,18 @@
 import operator
 from email.message import Message
 from typing import (
-    TYPE_CHECKING,
     Any,
-    List,
     Callable,
     Dict,
     Text,
-    SupportsInt,
-    Optional,
-    Union
+    Optional
 )
 
 from sifter.grammar.test import Test
 from sifter.validators.tag import Tag
 from sifter.validators.number import Number
 from sifter.grammar.state import EvaluationState
 
-if TYPE_CHECKING:
-    from sifter.grammar.tag import Tag as TagGrammar
-    from sifter.grammar.string import String
-
 
 # section 5.9
 class TestSize(Test):
@@ -38,20 +30,14 @@ class TestSize(Test):
         'UNDER': operator.lt,
     }
 
-    def __init__(
-        self,
-        arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
-        tests: Optional[List['Test']] = None
-    ) -> None:
-        super().__init__(arguments, tests)
-        self.comparison_fn = self.COMPARISON_FNS[self.tagged_args['size'][0]]  # type: ignore
-        self.comparison_size = self.tagged_args['size'][1]
-
     def evaluate(self, message: Message, state: EvaluationState) -> Optional[bool]:
+        comparison_fn = self.COMPARISON_FNS[self.tagged_args['size'][0]]  # type: ignore
+        comparison_size = self.tagged_args['size'][1]
+
         # FIXME: size is defined as number of octets, whereas this gives us
         # number of characters
         message_size = len(message.as_string())
-        return self.comparison_fn(message_size, self.comparison_size)
+        return comparison_fn(message_size, comparison_size)
 
 
 TestSize.register()