Enable iterators to be usable in places where lists are expected

kennknowles · kennknowles · commit 14c60d3f2115 · 2013-02-15T13:04:58.000-05:00
diff --git a/jsonpath_rw/jsonpath.py b/jsonpath_rw/jsonpath.py
@@ -1,4 +1,5 @@
 import logging
+import six
 from itertools import *
 
 logger = logging.getLogger(__name__)
@@ -265,11 +266,19 @@ def __init__(self, start=None, end=None, step=None):
         self.step = step
     
     def find(self, data):
-        # Here's the hack. If not a list, try again as though it were.
-        if not isinstance(data, list):
+        # Here's the hack. If it is a dictionary or some kind of constant,
+        # put it in a single-element list
+        if (isinstance(data, dict) or isinstance(data, six.integer_types) 
+                                   or isinstance(data, six.string_types)):
+
             return self.find([data])
 
-        return data[self.start:self.end:self.step]
+        # 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 data
+        else:
+            return data[self.start:self.end:self.step]
 
     def __str__(self):
         if self.start == None and self.end == None and self.step == None:
diff --git a/setup.py b/setup.py
@@ -17,5 +17,5 @@
     long_description=open('README.txt').read(),
     packages = ['jsonpath_rw'],
     test_suite = 'tests',
-    install_requires = [ 'ply', 'decorator' ],
+    install_requires = [ 'ply', 'decorator', 'six' ],
 )
diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py
@@ -31,11 +31,13 @@ def test_index(self):
 
     def test_slice(self):
         self.check_cases([('[*]', [1, 2, 3], [1, 2, 3]),
+                          ('[*]', xrange(1, 4), [1, 2, 3]),
                           ('[1:]', [1, 2, 3, 4], [2, 3, 4]),
                           ('[:2]', [1, 2, 3, 4], [1, 2])])
 
     def test_child(self):
         self.check_cases([('foo.baz', {'foo': {'baz': 3}}, [3]),
+                          ('foo.baz', {'foo': {'baz': [3]}}, [[3]]),
                           ('foo.baz.bizzle', {'foo': {'baz': {'bizzle': 5}}}, [5])])
 
     def test_descendants(self):

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`long_description=open('README.txt').read(),`
`18`	`18`	`packages = ['jsonpath_rw'],`
`19`	`19`	`test_suite = 'tests',`
`20`		`- install_requires = [ 'ply', 'decorator' ],`
	`20`	`+ install_requires = [ 'ply', 'decorator', 'six' ],`
`21`	`21`	`)`