Merge branch 'feature-saferfilter' of https://github.com/elasticsales/mongoengine into 0.8

2012-12-19 11:47:46 +00:00
parent 3e8f02c64b 148f8b8a3a
commit accdd82970
2 changed files with 11 additions and 0 deletions
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -117,6 +117,9 @@ class QuerySet(object):
        """
        query = Q(**query)
        if q_obj:
+            # make sure proper query object is passed
+            if not isinstance(q_obj, QNode):
+                raise InvalidQueryError('Not a query object: %s. Did you intend to use key=value?' % q_obj)
            query &= q_obj
        self._query_obj &= query
        self._mongo_query = None