Merge df1fc8e into ac58fe5

CHANGES.rst

@@ -1,7 +1,7 @@
 0.10.2 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- fix is_iter implementation #30 (mamico)
 
 
 0.10.1 (2016-06-15)

scorched/search.py

@@ -5,20 +5,22 @@
 import numbers
 import operator
 import re
+
 import scorched.strings
 import scorched.exc
 import scorched.dates
 
 from functools import reduce
 from scorched.compat import str
+from scorched.compat import basestring
 from scorched.compat import python_2_unicode_compatible
 
 
 PARSERS = ("edismax", "dismax")
 
 
 def is_iter(val):
-    return isinstance(val, (tuple, list))
+    return not isinstance(val, basestring) and isinstance(val, collections.Iterable)
 
 
 class LuceneQuery(object):

scorched/tests/test_search.py

@@ -9,7 +9,8 @@
                              PostingsHighlightOptions, FacetPivotOptions,
                              RequestHandlerOption, DebugOptions,
                              params_from_dict, FacetRangeOptions,
-                             TermVectorOptions, StatOptions)
+                             TermVectorOptions, StatOptions,
+                             is_iter)
 from scorched.strings import WildcardString
 from nose.tools import assert_equal
 
@@ -627,3 +628,11 @@ def test_url_encode_data():
 def test_mlt_query_options():
     for (fields, query_fields, kwargs, output) in mlt_query_options_data:
         yield check_mlt_query_options, fields, query_fields, kwargs, output
+
+
+def test_is_iter():
+    assert is_iter("abc") == False
+    assert is_iter(1) == False
+    assert is_iter([1, 2]) == True
+    assert is_iter((1, 2)) == True
+    assert is_iter(set([1, 2])) == True