Python 2 & 3 support

kennknowles · kennknowles · commit 4ae5f3f43645 · 2013-03-26T14:05:30.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: python
 python:
+ - "2.6"
  - "2.7"
+ - "3.2"
+ - "3.3"
 install: 
  - "pip install . --use-mirrors"
  - "pip install pytest --use-mirrors"
diff --git a/jsonpath_rw/__init__.py b/jsonpath_rw/__init__.py
@@ -1,2 +1,2 @@
-from jsonpath import *
-from parser import parse
+from .jsonpath import *
+from .parser import parse
diff --git a/jsonpath_rw/jsonpath.py b/jsonpath_rw/jsonpath.py
@@ -1,5 +1,7 @@
+from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import logging
 import six
+from six.moves import xrange
 from itertools import *
 
 logger = logging.getLogger(__name__)
@@ -283,7 +285,7 @@ def match_recursively(datum):
             # Manually do the * or [*] to avoid coercion and recurse just the right-hand pattern
             if isinstance(datum.value, list):
                 recursive_matches = [submatch
-                                     for i in xrange(0, len(datum.value))
+                                     for i in range(0, len(datum.value))
                                      for submatch in match_recursively(DatumInContext(datum.value[i], context=datum, path=Index(i)))]
 
             elif isinstance(datum.value, dict):
diff --git a/jsonpath_rw/lexer.py b/jsonpath_rw/lexer.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import sys
 import logging
 
@@ -40,7 +41,7 @@ def tokenize(self, string):
     
     reserved_words = { 'where': 'WHERE' }
 
-    tokens = ['DOUBLEDOT', 'NUMBER', 'ID'] + reserved_words.values()
+    tokens = ['DOUBLEDOT', 'NUMBER', 'ID'] + list(reserved_words.values())
 
     states = [ ('singlequote', 'exclusive'),
                ('doublequote', 'exclusive') ]
@@ -107,4 +108,4 @@ def t_error(self, t):
     logging.basicConfig()
     lexer = JsonPathLexer(debug=True)
     for token in lexer.tokenize(sys.stdin.read()):
-        print '%-20s%s' % (token.value, token.type)
+        print('%-20s%s' % (token.value, token.type))
diff --git a/jsonpath_rw/parser.py b/jsonpath_rw/parser.py
@@ -1,3 +1,4 @@
+from __future__ import print_function, absolute_import, division, generators, nested_scopes
 import sys
 import os.path
 import logging
@@ -163,12 +164,12 @@ def __init__(self, iterator):
 
     def token(self):
         try:
-            return self.iterator.next()
+            return next(self.iterator)
         except StopIteration:
             return None
 
 
 if __name__ == '__main__':
     logging.basicConfig()
     parser = JsonPathParser(debug=True)
-    print parser.parse(sys.stdin.read())
+    print(parser.parse(sys.stdin.read()))
diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import unittest
 
 from jsonpath_rw import jsonpath # For setting the global auto_id_field flag
@@ -89,21 +90,23 @@ def check_cases(self, test_cases):
         # Also, we coerce iterables, etc, into the desired target type
 
         for string, data, target in test_cases:
-            print 'parse("%s").find(%s) =?= %s' % (string, data, target)
+            print('parse("%s").find(%s) =?= %s' % (string, data, target))
             result = parse(string).find(data)
             if isinstance(target, list):
                 assert [r.value for r in result] == target
+            elif isinstance(target, set):
+                assert {r.value for r in result} == target
             else:
                 assert result.value == target
 
     def test_fields_value(self):
         jsonpath.auto_id_field = None
         self.check_cases([ ('foo', {'foo': 'baz'}, ['baz']),
                            ('foo,baz', {'foo': 1, 'baz': 2}, [1, 2]),
-                           ('*', {'foo': 1, 'baz': 2}, [1, 2]) ])
+                           ('*', {'foo': 1, 'baz': 2}, {1, 2}) ])
 
         jsonpath.auto_id_field = 'id'
-        self.check_cases([ ('*', {'foo': 1, 'baz': 2}, [1, 2, '@']) ])
+        self.check_cases([ ('*', {'foo': 1, 'baz': 2}, {1, 2, '@'}) ])
 
     def test_index_value(self):
         self.check_cases([
@@ -146,21 +149,23 @@ def check_paths(self, test_cases):
         # Also, we coerce iterables, etc, into the desired target type
 
         for string, data, target in test_cases:
-            print 'parse("%s").find(%s).paths =?= %s' % (string, data, target)
+            print('parse("%s").find(%s).paths =?= %s' % (string, data, target))
             result = parse(string).find(data)
             if isinstance(target, list):
                 assert [str(r.full_path) for r in result] == target
+            elif isinstance(target, set):
+                assert {str(r.full_path) for r in result} == target
             else:
                 assert str(result.path) == target
 
     def test_fields_paths(self):
         jsonpath.auto_id_field = None
         self.check_paths([ ('foo', {'foo': 'baz'}, ['foo']),
                            ('foo,baz', {'foo': 1, 'baz': 2}, ['foo', 'baz']),
-                           ('*', {'foo': 1, 'baz': 2}, ['foo', 'baz']) ])
+                           ('*', {'foo': 1, 'baz': 2}, {'foo', 'baz'}) ])
 
         jsonpath.auto_id_field = 'id'
-        self.check_paths([ ('*', {'foo': 1, 'baz': 2}, ['foo', 'baz', 'id']) ])
+        self.check_paths([ ('*', {'foo': 1, 'baz': 2}, {'foo', 'baz', 'id'}) ])
 
     def test_index_paths(self):
         self.check_paths([('[0]', [42], ['[0]']),
@@ -190,7 +195,7 @@ def test_fields_auto_id(self):
                            ('*.id', 
                             {'foo':{'id': 1},
                              'baz': 2},
-                             ['1', 'baz']) ])
+                             {'1', 'baz'}) ])
 
     def test_index_auto_id(self):
         jsonpath.auto_id_field = "id"
diff --git a/tests/test_lexer.py b/tests/test_lexer.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import logging
 import unittest
 
@@ -22,7 +23,7 @@ def assert_lex_equiv(self, s, stream2):
         stream2 = list(stream2)
         assert len(stream1) == len(stream2)
         for token1, token2 in zip(stream1, stream2):
-            print token1, token2
+            print(token1, token2)
             assert token1.type  == token2.type
             assert token1.value == token2.value
 
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import unittest
 
 from jsonpath_rw.lexer import JsonPathLexer
@@ -15,7 +16,7 @@ def check_parse_cases(self, test_cases):
         parser = JsonPathParser(debug=True, lexer_class=lambda:JsonPathLexer(debug=False)) # Note that just manually passing token streams avoids this dep, but that sucks
 
         for string, parsed in test_cases:
-            print string, '=?=', parsed # pytest captures this and we see it only on a failure, for debugging
+            print(string, '=?=', parsed) # pytest captures this and we see it only on a failure, for debugging
             assert parser.parse(string) == parsed
 
     def test_atomic(self):
