add python3 support

Author: thperret

setup.py

@@ -17,6 +17,7 @@
         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/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/test_evaluation.py

@@ -1,6 +1,7 @@
 import email
 import os.path
 import unittest
+import codecs
 
 import sifter.parser
 
@@ -21,12 +22,12 @@ def setUp(self):
         self.messages = {}
         self.rules = {}
         for result in self.EVAL_RESULTS:
-            msg_fh = open(os.path.join(os.path.dirname(__file__), result[0]))
-            self.messages.setdefault(result[0], email.message_from_file(msg_fh))
-            msg_fh.close()
-            rule_fh = open(os.path.join(os.path.dirname(__file__), result[1]))
-            self.rules.setdefault(result[1], sifter.parser.parse_file(rule_fh))
-            rule_fh.close()
+            with codecs.open(os.path.join(os.path.dirname(__file__), result[0]),
+                             encoding='utf-8') as msg_fh:
+                self.messages.setdefault(result[0], email.message_from_file(msg_fh))
+            with codecs.open(os.path.join(os.path.dirname(__file__), result[1]),
+                             encoding='utf-8') as rule_fh:
+                self.rules.setdefault(result[1], sifter.parser.parse_file(rule_fh))
 
     def test_msg_rule_cross_product(self):
         for result in self.EVAL_RESULTS:

sifter/t/test_parser.py

@@ -1,19 +1,19 @@
 import os.path
 import unittest
+import codecs
 
 import sifter.parser
 
 class TestParseFile(unittest.TestCase):
 
     def test_files(self):
         for in_filename, golden_filename in (("parser_1.in", "parser_1.out"),):
-            in_fh = open(os.path.join(os.path.dirname(__file__), in_filename))
-            test_output = str(sifter.parser.parse_file(in_fh))
-            in_fh.close()
-            golden_fh = open(os.path.join(os.path.dirname(__file__),
-                golden_filename))
-            golden_output = golden_fh.read()
-            golden_fh.close()
+            with codecs.open(os.path.join(os.path.dirname(__file__), in_filename),
+                            encoding='utf-8') as in_fh:
+                test_output = str(sifter.parser.parse_file(in_fh))
+            with codecs.open(os.path.join(os.path.dirname(__file__), golden_filename),
+                             encoding='utf-8') as golden_fh:
+                golden_output = golden_fh.read()
             self.assertEqual(test_output, golden_output)
 
 if __name__ == '__main__':

sifter/validators/stringlist.py

@@ -14,7 +14,7 @@ def validate(self, arg_list, starting_index):
         arg = arg_list[starting_index]
 
         if not (isinstance(arg, list)
-                and all(isinstance(list_member, basestring)
+                and all(isinstance(list_member, (str, bytes))
                         for list_member in arg)):
             return 0
         if self.length is not None and len(arg) != self.length:

sifter/validators/tag.py

@@ -8,7 +8,7 @@ class Tag(sifter.grammar.Validator):
 
     def __init__(self, allowed_tags=None, tag_arg_validators=None):
         super(Tag, self).__init__()
-        if isinstance(allowed_tags, basestring):
+        if isinstance(allowed_tags, (str, bytes)):
             self.allowed_tags = [ allowed_tags ]
         else:
             self.allowed_tags = allowed_tags