Merge branch 'develop'

Author: manfred-kaiser

setup.py

@@ -6,42 +6,41 @@
     long_description = file.read()
 
 setup(
-        name = "sifter",
-        version = "0.1",
-        author = "Gary Peck",
-        author_email = "gary@realify.com",
-        url = "https://github.com/garyp/sifter",
-        license = "BSD",
-        description = "Parser/evaluator for the Sieve filtering language (RFC 5228)",
-        long_description = long_description,
-        install_requires=[
-            "ply",
-            ],
-        classifiers = [
-            "Programming Language :: Python",
-            "Programming Language :: Python :: 2",
-            "Programming Language :: Python :: 3",
-            "License :: OSI Approved :: BSD License",
-            "Development Status :: 4 - Beta",
-            "Intended Audience :: Developers",
-            "Intended Audience :: System Administrators",
-            "Operating System :: OS Independent",
-            "Topic :: Communications :: Email :: Filters",
-            "Topic :: Software Development :: Interpreters",
-            "Topic :: Software Development :: Libraries :: Python Modules",
-            ],
-        packages = [
-            "sifter",
-            "sifter.commands",
-            "sifter.comparators",
-            "sifter.extensions",
-            "sifter.grammar",
-            "sifter.t",
-            "sifter.tests",
-            "sifter.validators",
-            ],
-        package_data = {
-            "sifter.t" : ["*.in", "*.out", "*.msg", "*.rules"],
-            },
-        )
-
+    name="sifter",
+    version="0.1",
+    author="Gary Peck",
+    author_email="gary@realify.com",
+    url="https://github.com/garyp/sifter",
+    license="BSD",
+    description="Parser/evaluator for the Sieve filtering language (RFC 5228)",
+    long_description=long_description,
+    install_requires=[
+        "ply",
+    ],
+    classifiers=[
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: BSD License",
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "Intended Audience :: System Administrators",
+        "Operating System :: OS Independent",
+        "Topic :: Communications :: Email :: Filters",
+        "Topic :: Software Development :: Interpreters",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+    ],
+    packages=[
+        "sifter",
+        "sifter.commands",
+        "sifter.comparators",
+        "sifter.extensions",
+        "sifter.grammar",
+        "sifter.t",
+        "sifter.tests",
+        "sifter.validators",
+    ],
+    package_data={
+        "sifter.t": ["*.in", "*.out", "*.msg", "*.rules"],
+    },
+)

sifter/commands/discard.py

@@ -2,6 +2,7 @@
 
 __all__ = ('CommandDiscard',)
 
+
 # section 4.4
 class CommandDiscard(sifter.grammar.Command):
 
@@ -16,4 +17,5 @@ def __init__(self, arguments=None, tests=None, block=None):
     def evaluate(self, message, state):
         state.actions.cancel_implicit_keep()
 
+
 CommandDiscard.register()

sifter/commands/fileinto.py

@@ -3,6 +3,7 @@
 
 __all__ = ('CommandFileInto',)
 
+
 # section 4.1
 class CommandFileInto(sifter.grammar.Command):
 
@@ -11,9 +12,9 @@ class CommandFileInto(sifter.grammar.Command):
     def __init__(self, arguments=None, tests=None, block=None):
         super(CommandFileInto, self).__init__(arguments, tests, block)
         _, positional_args = self.validate_arguments(
-                {},
-                [ sifter.validators.StringList(length=1), ],
-            )
+            {},
+            [sifter.validators.StringList(length=1), ],
+        )
         self.validate_tests_size(0)
         self.validate_block_size(0)
         self.file_dest = positional_args[0]
@@ -23,4 +24,5 @@ def evaluate(self, message, state):
         state.actions.append('fileinto', self.file_dest)
         state.actions.cancel_implicit_keep()
 
+
 CommandFileInto.register()

sifter/commands/if_cmd.py

@@ -2,6 +2,7 @@
 
 __all__ = ('CommandIf', 'CommandElsIf', 'CommandElse',)
 
+
 # section 3.1
 class CommandIfBase(sifter.grammar.Command):
 
@@ -24,6 +25,7 @@ class CommandIf(CommandIfBase):
 
     RULE_IDENTIFIER = 'IF'
 
+
 CommandIf.register()
 
 
@@ -37,6 +39,7 @@ def evaluate(self, message, state):
         else:
             return super(CommandElsIf, self).evaluate(message, state)
 
+
 CommandElsIf.register()
 
 
@@ -55,4 +58,5 @@ def evaluate(self, message, state):
         else:
             return self.block.evaluate(message, state)
 
+
 CommandElse.register()

sifter/commands/keep.py

@@ -2,6 +2,7 @@
 
 __all__ = ('CommandKeep',)
 
+
 # section 4.3
 class CommandKeep(sifter.grammar.Command):
 
@@ -16,4 +17,5 @@ def __init__(self, arguments=None, tests=None, block=None):
     def evaluate(self, message, state):
         state.actions.append('keep').cancel_implicit_keep()
 
+
 CommandKeep.register()

sifter/commands/redirect.py

@@ -5,6 +5,7 @@
 
 __all__ = ('CommandRedirect',)
 
+
 # section 4.2
 class CommandRedirect(sifter.grammar.Command):
 
@@ -13,9 +14,9 @@ class CommandRedirect(sifter.grammar.Command):
     def __init__(self, arguments=None, tests=None, block=None):
         super(CommandRedirect, self).__init__(arguments, tests, block)
         _, positional_args = self.validate_arguments(
-                {},
-                [ sifter.validators.StringList(length=1), ],
-            )
+            {},
+            [sifter.validators.StringList(length=1), ],
+        )
         self.validate_tests_size(0)
         self.validate_block_size(0)
         self.email_address = positional_args[0][0]
@@ -26,12 +27,13 @@ def __init__(self, arguments=None, tests=None, block=None):
         realname, emailaddr = email.utils.parseaddr(self.email_address)
         if emailaddr == "":
             raise sifter.grammar.RuleSyntaxError(
-                    "REDIRECT destination not a valid email address: %s"
-                    % self.email_address
-                    )
+                "REDIRECT destination not a valid email address: %s"
+                % self.email_address
+            )
 
     def evaluate(self, message, state):
         state.actions.append('redirect', self.email_address)
         state.actions.cancel_implicit_keep()
 
+
 CommandRedirect.register()

sifter/commands/require.py

@@ -4,6 +4,7 @@
 
 __all__ = ('CommandRequire',)
 
+
 # section 3.2
 class CommandRequire(sifter.grammar.Command):
 
@@ -12,18 +13,21 @@ class CommandRequire(sifter.grammar.Command):
     def __init__(self, arguments=None, tests=None, block=None):
         super(CommandRequire, self).__init__(arguments, tests, block)
         _, positional_args = self.validate_arguments(
-                {},
-                [ sifter.validators.StringList(), ],
-            )
+            {},
+            [sifter.validators.StringList(), ],
+        )
         self.validate_tests_size(0)
         self.validate_block_size(0)
         self.ext_names = positional_args[0]
 
     def evaluate(self, message, state):
         for ext_name in self.ext_names:
             if not sifter.handler.get('extension', ext_name):
-                raise RuntimeError("Required extension '%s' not supported"
-                        % ext_name)
+                raise RuntimeError(
+                    "Required extension '%s' not supported"
+                    % ext_name
+                )
             state.require_extension(ext_name)
 
+
 CommandRequire.register()

sifter/commands/stop.py

@@ -2,6 +2,7 @@
 
 __all__ = ('CommandStop',)
 
+
 # section 3.3
 class CommandStop(sifter.grammar.Command):
 
@@ -16,4 +17,5 @@ def __init__(self, arguments=None, tests=None, block=None):
     def evaluate(self, message, state):
         state.actions.append('stop')
 
+
 CommandStop.register()

sifter/comparator.py

@@ -2,18 +2,23 @@
 
 __all__ = ('register', 'get_match_fn',)
 
+
 def register(comparator_name, comparator_cls):
     sifter.handler.register('comparator', comparator_name, comparator_cls)
 
+
 def get_match_fn(comparator, match_type):
     # section 2.7.3: default comparator is 'i;ascii-casemap'
-    if comparator is None: comparator = 'i;ascii-casemap'
+    if comparator is None:
+        comparator = 'i;ascii-casemap'
     # RFC 4790, section 3.1: the special identifier 'default' refers to the
     # implementation-defined default comparator
-    elif comparator == 'default': comparator = 'i;ascii-casemap'
+    elif comparator == 'default':
+        comparator = 'i;ascii-casemap'
 
     # section 2.7.1: default match type is ":is"
-    if match_type is None: match_type = 'IS'
+    if match_type is None:
+        match_type = 'IS'
 
     # TODO: support wildcard matching in comparator names (RFC 4790)
     cmp_handler = sifter.handler.get('comparator', comparator)
@@ -24,9 +29,8 @@ def get_match_fn(comparator, match_type):
         cmp_fn = getattr(cmp_handler, 'cmp_%s' % match_type.lower())
     except AttributeError:
         raise RuntimeError(
-                "':%s' matching not supported by comparator '%s'"
-                % (match_type, comparator)
-                )
+            "':%s' matching not supported by comparator '%s'"
+            % (match_type, comparator)
+        )
 
     return (cmp_fn, comparator, match_type)
-

sifter/comparators/ascii_casemap.py

@@ -1,15 +1,10 @@
-import string
-try:
-    # Python 3
-    maketrans = str.maketrans
-except AttributeError:
-    # Python 2
-    maketrans = string.maketrans
-
 from sifter.comparators.octet import ComparatorOctet
 
+maketrans = str.maketrans
+
 __all__ = ('ComparatorASCIICasemap',)
 
+
 class ComparatorASCIICasemap(ComparatorOctet):
 
     COMPARATOR_ID = 'i;ascii-casemap'
@@ -18,4 +13,5 @@ class ComparatorASCIICasemap(ComparatorOctet):
     def sort_key(cls, s):
         return s.upper()
 
+
 ComparatorASCIICasemap.register()