Query filter can accept the query as positional arg

also it's json is different from fquery

elasticsearch_dsl/filter.py

@@ -3,10 +3,13 @@
 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 positional argument 'filters'." % name_or_filter)
-        params['filters'] = filters
+        # someone passed in positional argument to F outside of and/or or query
+        if name_or_filter in ('and', 'or'):
+            params['filters'] = filters
+        elif name_or_filter == 'query':
+            params['query'] = filters
+        else:
+            raise ValueError("Filter %r doesn't accept positional argument." % name_or_filter)
 
     # {"term": {...}}
     if isinstance(name_or_filter, dict):
@@ -81,14 +84,28 @@ class And(AndOrFilter, Filter):
 class Or(AndOrFilter, Filter):
     name = 'or'
 
+class Query(Filter):
+    name = 'query'
+    _param_defs = {'query': {'type': 'query'}}
+
+    def __init__(self, query=None, **kwargs):
+        if query is not None:
+            kwargs['query'] = query
+        super(Query, self).__init__(**kwargs)
+
+    def to_dict(self):
+        d = super(Query, self).to_dict()
+        d[self.name].update(d[self.name].pop('query', {}))
+        return d
+
+
 FILTERS = (
     # relationships
     ('nested', {'filter': {'type': 'filter'}}),
     ('has_child', {'filter': {'type': 'filter'}}),
     ('has_parent', {'filter': {'type': 'filter'}}),
 
     ('fquery', {'query': {'type': 'query'}}),
-    ('query', {'query': {'type': 'query'}}),
 
     # core filters
     ('exists', None),

test_elasticsearch_dsl/test_filter.py

@@ -1,4 +1,4 @@
-from elasticsearch_dsl import filter
+from elasticsearch_dsl import filter, Q
 
 from pytest import raises
 
@@ -20,3 +20,8 @@ def test_not_doesnt_have_to_wrap_filter():
     assert f.filter == filter.F('term', field='value')
     assert f == filter.Not(filter.F('term', field='value'))
 
+def test_query_can_use_positional_arg():
+    f = filter.F('query', Q('match_all'))
+
+    assert f.query == Q('match_all')
+    assert {'query': {'match_all': {}}} == f.to_dict()