Remove dependency on six

Author: michaelmior

jsonpath_ng/ext/filter.py

@@ -13,7 +13,6 @@
 
 import operator
 import re
-from six import moves
 
 from .. import JSONPath, DatumInContext, Index
 
@@ -49,7 +48,7 @@ def find(self, datum):
             return []
 
         return [DatumInContext(datum.value[i], path=Index(i), context=datum)
-                for i in moves.range(0, len(datum.value))
+                for i in range(0, len(datum.value))
                 if (len(self.expressions) ==
                     len(list(filter(lambda x: x.find(datum.value[i]),
                                     self.expressions))))]

jsonpath_ng/jsonpath.py

@@ -1,7 +1,5 @@
 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 *  # noqa
 from .exceptions import JSONPathError
 
@@ -736,13 +734,13 @@ def find(self, datum):
             return []
         # Here's the hack. If it is a dictionary or some kind of constant,
         # put it in a single-element list
-        if (isinstance(datum.value, dict) or isinstance(datum.value, six.integer_types) or isinstance(datum.value, six.string_types)):
+        if (isinstance(datum.value, dict) or isinstance(datum.value, int) or isinstance(datum.value, str)):
             return self.find(DatumInContext([datum.value], path=datum.path, context=datum.context))
 
         # Some iterators do not support slicing but we can still
         # at least work for '*'
         if self.start == None and self.end == None and self.step == None:
-            return [DatumInContext(datum.value[i], path=Index(i), context=datum) for i in xrange(0, len(datum.value))]
+            return [DatumInContext(datum.value[i], path=Index(i), context=datum) for i in range(0, len(datum.value))]
         else:
             return [DatumInContext(datum.value[i], path=Index(i), context=datum) for i in range(0, len(datum.value))[self.start:self.end:self.step]]
 

requirements.txt

@@ -1,3 +1,2 @@
 ply
-six
 setuptools>=18.5

setup.py

@@ -23,7 +23,7 @@
     },
     test_suite='tests',
     install_requires=[
-        'ply', 'six'
+        'ply'
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',

tests/test_jsonpath.py

@@ -136,7 +136,7 @@ def test_index_value(self):
 
     def test_slice_value(self):
         self.check_cases([('[*]', [1, 2, 3], [1, 2, 3]),
-                          ('[*]', xrange(1, 4), [1, 2, 3]),
+                          ('[*]', range(1, 4), [1, 2, 3]),
                           ('[1:]', [1, 2, 3, 4], [2, 3, 4]),
                           ('[:2]', [1, 2, 3, 4], [1, 2])])
 

tests/test_jsonpath_rw_ext.py

@@ -21,7 +21,6 @@
 
 from jsonpath_ng import jsonpath  # For setting the global auto_id_field flag
 from oslotest import base
-from six import moves
 
 from jsonpath_ng.ext import parser
 
@@ -416,7 +415,7 @@ def test_index_value(self):
 
     def test_slice_value(self):
         self.check_cases([('[*]', [1, 2, 3], [1, 2, 3]),
-                          ('[*]', moves.range(1, 4), [1, 2, 3]),
+                          ('[*]', range(1, 4), [1, 2, 3]),
                           ('[1:]', [1, 2, 3, 4], [2, 3, 4]),
                           ('[:2]', [1, 2, 3, 4], [1, 2])])