From f2d5245bd814a59cc6e1ca514aa5a4b2cd94bee2 Mon Sep 17 00:00:00 2001 From: Matt Wright Date: Fri, 3 May 2013 12:13:58 -0400 Subject: [PATCH] Import check to account for new version of MongoEngine --- flask_security/datastore.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flask_security/datastore.py b/flask_security/datastore.py index e3e600a..630389b 100644 --- a/flask_security/datastore.py +++ b/flask_security/datastore.py @@ -190,7 +190,11 @@ class MongoEngineUserDatastore(MongoEngineDatastore, UserDatastore): UserDatastore.__init__(self, user_model, role_model) def find_user(self, **kwargs): - from mongoengine.queryset import Q, QCombination + try: + from mongoengine.queryset import Q, QCombination + except ImportError: + from mongoengine.queryset.visitor import Q, QCombination + queries = map(lambda i: Q(**{i[0]: i[1]}), kwargs.items()) query = QCombination(QCombination.AND, queries) return self.user_model.objects(query).first()