Make sure positional arguments for F() are only accepted for And/Or

Fixes elastic#17, thanks Benoss!

Author: honzakral

elasticsearch_dsl/filter.py

@@ -3,6 +3,9 @@
 def F(name_or_filter, filters=None, **params):
     # 'and/or', [F(), F()]
     if filters is not None:
+        # someone passed in positional argument to F outside of and/or
+        if name_or_filter not in ('and', 'or'):
+            raise ValueError("Filter %r doesn't accept argument 'filters'." % name_or_filter)
         params['filters'] = filters
 
     # {"term": {...}}

test_elasticsearch_dsl/test_filter.py

@@ -1,13 +1,20 @@
 from elasticsearch_dsl import filter
 
+from pytest import raises
+
 def test_and_can_be_created_with_a_list():
     f = filter.F('and', [filter.F('term', field='value')])
 
     assert isinstance(f, filter.And)
     assert f.filters == [filter.F('term', field='value')]
 
+def test_other_filters_must_use_kwargs():
+    with raises(ValueError):
+        filter.F('bool', [filter.F('term', field='value')])
+
 def test_not_doesnt_have_to_wrap_filter():
     f = filter.F('not', term={'field': 'value'})
 
     assert isinstance(f, filter.Not)
     assert f.filter == filter.F('term', field='value')
+