Skip to content

Commit 4fbd8bd

Browse files
committed
Remove broken import BaseQuerySet
import BaseQuerySet never worked as the path was wrong, so flask-mongoengine would always import QuerySet anyway. If BaseQuerySet is needed, the import should be fixed using from mongoengine.queryset.base import BaseQuerySet instead of from mongoengine.base import BaseQuerySet
1 parent 3ced143 commit 4fbd8bd

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

flask_mongoengine/json.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
from flask.json import JSONEncoder
22
from bson import json_util
33
from mongoengine.base import BaseDocument
4-
try:
5-
from mongoengine.base import BaseQuerySet
6-
except ImportError as ie: # support mongoengine < 0.7
7-
from mongoengine.queryset import QuerySet as BaseQuerySet
4+
from mongoengine.queryset import QuerySet
5+
86

97
def _make_encoder(superclass):
108
class MongoEngineJSONEncoder(superclass):
@@ -15,7 +13,7 @@ class MongoEngineJSONEncoder(superclass):
1513
def default(self, obj):
1614
if isinstance(obj, BaseDocument):
1715
return json_util._json_convert(obj.to_mongo())
18-
elif isinstance(obj, BaseQuerySet):
16+
elif isinstance(obj, QuerySet):
1917
return json_util._json_convert(obj.as_pymongo())
2018
return superclass.default(self, obj)
2119
return MongoEngineJSONEncoder

0 commit comments

Comments
 (0)