Merge pull request #212 from Nobatek/dev_JL_cleanup_ME_0_7

ME 0.7 removal cleanup

Author: losintikfos

flask_mongoengine/__init__.py

@@ -7,10 +7,7 @@
 import mongoengine
 from distutils.version import StrictVersion
 
-if mongoengine.__version__ == '0.7.10':
-    from mongoengine.base import BaseField
-else:
-    from mongoengine.base.fields import BaseField
+from mongoengine.base.fields import BaseField
 
 
 from mongoengine.queryset import MultipleObjectsReturned, DoesNotExist, QuerySet
@@ -21,7 +18,7 @@
 from .sessions import *
 from .pagination import *
 from .metadata import *
-from .json import overide_json_encoder
+from .json import override_json_encoder
 from .wtf import WtfBaseField
 
 def _patch_base_field(object, name):
@@ -116,7 +113,7 @@ def init_app(self, app, config=None):
         app.extensions = getattr(app, 'extensions', {})
 
         # Make documents JSON serializable
-        overide_json_encoder(app)
+        override_json_encoder(app)
 
         if not 'mongoengine' in app.extensions:
             app.extensions['mongoengine'] = {}

flask_mongoengine/json.py

@@ -1,10 +1,8 @@
 from flask.json import JSONEncoder
 from bson import json_util
 from mongoengine.base import BaseDocument
-try:
-    from mongoengine.base import BaseQuerySet
-except ImportError as ie: # support mongoengine < 0.7
-    from mongoengine.queryset import QuerySet as BaseQuerySet
+from mongoengine.queryset import QuerySet
+
 
 def _make_encoder(superclass):
     class MongoEngineJSONEncoder(superclass):
@@ -15,15 +13,15 @@ class MongoEngineJSONEncoder(superclass):
         def default(self, obj):
             if isinstance(obj, BaseDocument):
                 return json_util._json_convert(obj.to_mongo())
-            elif isinstance(obj, BaseQuerySet):
+            elif isinstance(obj, QuerySet):
                 return json_util._json_convert(obj.as_pymongo())
             return superclass.default(self, obj)
     return MongoEngineJSONEncoder
 
 MongoEngineJSONEncoder = _make_encoder(JSONEncoder)
 
 
-def overide_json_encoder(app):
+def override_json_encoder(app):
     '''
     A function to dynamically create a new MongoEngineJSONEncoder class
     based upon a custom base class.

flask_mongoengine/pagination.py

@@ -145,7 +145,6 @@ def __init__(self, queryset, doc_id, field_name, page, per_page,
 
         field_attrs = {field_name: {"$slice": [start_index, per_page]}}
 
-        # Clone for mongoengine 0.7
         qs = queryset(pk=doc_id)
         self.items = getattr(qs.fields(**field_attrs).first(), field_name)
         self.total = total or len(getattr(qs.fields(**{field_name: 1}).first(),