merged master, fixed 1 merge conflict

2010-02-14 17:23:38 -06:00
parent d0ceb74a2e ea1fe6a538
commit 348f7b5dfc
6 changed files with 88 additions and 9 deletions
--- a/mongoengine/base.py
+++ b/mongoengine/base.py
@@ -55,7 +55,7 @@ class BaseField(object):
        """
        return self.to_python(value)

-    def prepare_query_value(self, value):
+    def prepare_query_value(self, op, value):
        """Prepare a value that is being used in a query for PyMongo.
        """
        return value
@@ -82,7 +82,7 @@ class ObjectIdField(BaseField):
                raise ValidationError(e.message)
        return value

-    def prepare_query_value(self, value):
+    def prepare_query_value(self, op, value):
        return self.to_mongo(value)

    def validate(self, value):