Merge pull request #1 from thperret/python3

add python3 support

Author: manfred-kaiser

.gitignore

@@ -5,3 +5,4 @@
 parser.out
 parsetab.py
 *.pyc
+*.egg-info/

setup.py

@@ -14,9 +14,13 @@
         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",

sifter/comparators/ascii_casemap.py

@@ -1,4 +1,10 @@
 import string
+try:
+    # Python 3
+    maketrans = str.maketrans
+except AttributeError:
+    # Python 2
+    maketrans = string.maketrans
 
 from sifter.comparators.octet import ComparatorOctet
 
@@ -10,7 +16,6 @@ class ComparatorASCIICasemap(ComparatorOctet):
 
     @classmethod
     def sort_key(cls, s):
-        return s.translate(string.maketrans(string.ascii_lowercase,
-            string.ascii_uppercase))
+        return s.upper()
 
 ComparatorASCIICasemap.register()

sifter/extensions/builtin.py

@@ -20,8 +20,8 @@
 import sifter.comparators.octet
 
 import sifter.extension
-map(sifter.extension.register,
+list(map(sifter.extension.register,
     ('fileinto',
      'comparator-i;ascii-casemap',
      'comparator-i;octet',
-     ))
+     )))

sifter/grammar/command.py

@@ -1,5 +1,5 @@
 import sifter.grammar
-import rule
+from . import rule
 import sifter.utils
 
 __all__ = ('Command',)

sifter/grammar/command_list.py

@@ -22,5 +22,7 @@ def evaluate(self, message, state=None):
             # isn't required by the standard, but we might as well.
             if len(state.actions) > 0 and state.actions[-1][0] == 'stop':
                 break
+        if state.actions.implicit_keep:
+            state.actions.append('keep')
         return state.actions
 

sifter/grammar/lexer.py

@@ -93,6 +93,9 @@ def t_newline(t):
     r'(\r\n)+'
     t.lexer.lineno += t.value.count('\n')
 
+def t_error(t):
+    t.lexer.skip(1)
+
 
 if __name__ == '__main__':
     # PLY has a simple debugging mode that'll print out tokens for input coming

sifter/grammar/rule.py

@@ -51,9 +51,9 @@ def validate_arguments(self, tagged_args=None, positional_args=None):
             if not isinstance(self.arguments[i], sifter.grammar.Tag):
                 break
             num_valid_args = 0
-            for arg_name, arg_validator in tagged_args.iteritems():
+            for arg_name, arg_validator in tagged_args.items():
                 num_valid_args = arg_validator.validate(self.arguments, i)
-                if num_valid_args > 0:
+                if num_valid_args is not None and num_valid_args > 0:
                     if arg_name in seen_args:
                         raise RuleSyntaxError(
                                 "%s argument to %s was already seen earlier: %s"

sifter/grammar/test.py

@@ -1,4 +1,4 @@
-import rule
+from . import rule
 
 __all__ = ('Test',)
 

sifter/t/evaluation_3.msg

@@ -0,0 +1,14 @@
+Date: Tue, 1 Apr 1997 09:06:31 -0800 (PST)
+From: user1@example.org
+To: roadrunner@acme.example.com
+Subject: I have a present for you
+
+Look, I'm sorry about the whole anvil thing, and I really
+didn't mean to try and drop it on you from the top of the
+cliff.  I want to try to make it up to you.  I've got some
+great birdseed over here at my place--top of the line
+stuff--and if you come by, I'll have it all wrapped up
+for you.  I'm really sorry for all the problems I've caused
+for you over the years, but I know we can work this out.
+--
+Wile E. Coyote   "Super Genius"   coyote@desert.example.org