Make sure F({'and': []}) works

elastic · Jun 9, 2015 · d677bd7 · d677bd7
1 parent ab99a82
commit d677bd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/elasticsearch_dsl/filter.py b/elasticsearch_dsl/filter.py
@@ -19,7 +19,11 @@ def F(name_or_filter='match_all', filters=None, **params):
             raise ValueError('F() can only accept dict with a single filter ({"bool": {...}}). '
                  'Instead it got (%r)' % name_or_filter)
         name, params = name_or_filter.copy().popitem()
-        return Filter.get_dsl_class(name)(**params)
+        if isinstance(params, dict):
+            return Filter.get_dsl_class(name)(**params)
+        else:
+            # and filter can have list
+            return Filter.get_dsl_class(name)(params)
 
     # Term(...)
     if isinstance(name_or_filter, Filter):

diff --git a/test_elasticsearch_dsl/test_filter.py b/test_elasticsearch_dsl/test_filter.py
@@ -7,6 +7,11 @@ def test_repr():
 
     assert "Terms(some__path='value')" == repr(f)
 
+def test_and_can_be_created_from_list():
+    f = filter.F({'and': [{'term': {'f': 'v'}}, {'term': {'f2': 42}}]})
+
+    assert f == filter.And([filter.F('term', f='v'), filter.F('term', f2=42)])
+
 def test_empty_F_is_match_all():
     f = filter.F()