fixed "not defined" mypy error

Author: manfred-kaiser

sifter/commands/discard.py

@@ -1,10 +1,10 @@
-import sifter.grammar
+from sifter.grammar.command import Command
 
 __all__ = ('CommandDiscard',)
 
 
 # section 4.4
-class CommandDiscard(sifter.grammar.Command):
+class CommandDiscard(Command):
 
     RULE_IDENTIFIER = 'DISCARD'
 

sifter/commands/if_cmd.py

@@ -1,10 +1,10 @@
-import sifter.grammar
+from sifter.grammar.command import Command
 
 __all__ = ('CommandIf', 'CommandElsIf', 'CommandElse',)
 
 
 # section 3.1
-class CommandIfBase(sifter.grammar.Command):
+class CommandIfBase(Command):
 
     def __init__(self, arguments=None, tests=None, block=None):
         super(CommandIfBase, self).__init__(arguments, tests, block)
@@ -41,7 +41,7 @@ def evaluate(self, message, state):
 CommandElsIf.register()
 
 
-class CommandElse(sifter.grammar.Command):
+class CommandElse(Command):
 
     RULE_IDENTIFIER = 'ELSE'
 

sifter/commands/keep.py

@@ -1,10 +1,10 @@
-import sifter.grammar
+from sifter.grammar.command import Command
 
 __all__ = ('CommandKeep',)
 
 
 # section 4.3
-class CommandKeep(sifter.grammar.Command):
+class CommandKeep(Command):
 
     RULE_IDENTIFIER = 'KEEP'
 

sifter/commands/redirect.py

@@ -1,6 +1,6 @@
 import email.utils
 
-import sifter.grammar
+from sifter.grammar.command import Command
 import sifter.validators
 from sifter.grammar.rule import RuleSyntaxError
 from sifter.validators.stringlist import StringList
@@ -9,7 +9,7 @@
 
 
 # section 4.2
-class CommandRedirect(sifter.grammar.Command):
+class CommandRedirect(Command):
 
     RULE_IDENTIFIER = 'REDIRECT'
 

sifter/commands/stop.py

@@ -1,10 +1,10 @@
-import sifter.grammar
+from sifter.grammar.command import Command
 
 __all__ = ('CommandStop',)
 
 
 # section 3.3
-class CommandStop(sifter.grammar.Command):
+class CommandStop(Command):
 
     RULE_IDENTIFIER = 'STOP'
 

sifter/comparators/octet.py

@@ -1,11 +1,11 @@
 import re
 
-import sifter.grammar
+from sifter.grammar.comparator import Comparator
 
 __all__ = ('ComparatorOctet',)
 
 
-class ComparatorOctet(sifter.grammar.Comparator):
+class ComparatorOctet(Comparator):
 
     COMPARATOR_ID = 'i;octet'
 

sifter/t/test_comparators.py

@@ -1,10 +1,10 @@
 import unittest
 
 import sifter.comparator
-import sifter.grammar
+from sifter.grammar.comparator import Comparator
 
 
-class MockComparator(sifter.grammar.Comparator):
+class MockComparator(Comparator):
 
     COMPARATOR_ID = 'i;vnd-mock'
 

sifter/t/test_validators.py

@@ -1,10 +1,10 @@
 import unittest
 
-import sifter.grammar
+from sifter.grammar.rule import Rule
 import sifter.validators
 
 
-class MockRule(sifter.grammar.Rule):
+class MockRule(Rule):
 
     RULE_TYPE = 'mock'
     RULE_IDENTIFIER = 'MOCKRULE'

sifter/tests/allof.py

@@ -2,13 +2,13 @@
     Text
 )
 
-import sifter.grammar
+from sifter.grammar.test import Test
 
 __all__ = ('TestAllOf',)
 
 
 # section 5.2
-class TestAllOf(sifter.grammar.Test):
+class TestAllOf(Test):
 
     RULE_IDENTIFIER: Text = 'ALLOF'
 

sifter/tests/anyof.py

@@ -1,10 +1,10 @@
-import sifter.grammar
+from sifter.grammar.test import Test
 
 __all__ = ('TestAnyOf',)
 
 
 # section 5.3
-class TestAnyOf(sifter.grammar.Test):
+class TestAnyOf(Test):
 
     RULE_IDENTIFIER = 'ANYOF'