Changed: Imports order, drop imports for python 2.7

docs/changelog.rst

@@ -26,6 +26,7 @@ Development
   argument, and will display custom message if specified. (#351)
 - UPDATED: `get_or_404` will raise 404 error only on `DoesNotExist` exception,
   other exceptions should be captured by user. (#360)
+- UPDATED: Fix imports order, drop imports for python 2.7 (#373)
 - RESTORED: Changelog for v0.9.2, v0.9.3, v0.9.4, v0.9.5 (#370)
 
 Tests and development for old packages versions dropped to minimize tests

examples/biggerapp/app.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 import flask
 
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), "../../")))

examples/biggerapp/models.py

@@ -1,4 +1,5 @@
 import datetime
+
 from flask_mongoengine import MongoEngine
 
 db = MongoEngine()

examples/biggerapp/views.py

@@ -1,5 +1,6 @@
 import flask
-from models import Todo
+
+from .models import Todo
 
 
 def index():

examples/simpleapp/app.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+import datetime
 import os
 import sys
-import datetime
+
 import flask
 
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), "../../")))
@@ -44,7 +45,7 @@ class Todo(db.Document):
 def index():
     # As a list to test debug toolbar
     Todo.objects().delete()  # Removes
-    Todo(title="Simple todo A ПЫЩЬ!", text="12345678910").save()  # Insert
+    Todo(title="Simple todo A", text="12345678910").save()  # Insert
     Todo(title="Simple todo B", text="12345678910").save()  # Insert
     Todo.objects(title__contains="B").update(set__text="Hello world")  # Update
     todos = Todo.objects.all()

flask_mongoengine/operation_tracker.py

@@ -2,19 +2,15 @@
 import functools
 import inspect
 import os
+import socketserver
 import sys
 import time
 
-try:
-    import SocketServer
-except ImportError:
-    import socketserver as SocketServer
-
 import bson
 import pymongo.collection
+import pymongo.command_cursor
 import pymongo.cursor
 import pymongo.helpers
-import pymongo.command_cursor
 
 __all__ = [
     "queries",
@@ -268,7 +264,7 @@ def _tidy_stacktrace():
     """
     Tidy the stack_trace
     """
-    socketserver_path = os.path.realpath(os.path.dirname(SocketServer.__file__))
+    socketserver_path = os.path.realpath(os.path.dirname(socketserver.__file__))
     pymongo_path = os.path.realpath(os.path.dirname(pymongo.__file__))
     paths = ["/site-packages/", "/flaskext/", socketserver_path, pymongo_path]
     internal = False

flask_mongoengine/pagination.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import math
+
 from flask import abort
 from mongoengine.queryset import QuerySet
 

flask_mongoengine/panels.py

@@ -4,7 +4,6 @@
 
 from flask_mongoengine import operation_tracker
 
-
 package_loader = PackageLoader("flask_mongoengine", "templates")
 
 

flask_mongoengine/wtf/__init__.py

@@ -1,2 +1,2 @@
-from flask_mongoengine.wtf.orm import model_fields, model_form  # noqa
 from flask_mongoengine.wtf.base import WtfBaseField  # noqa
+from flask_mongoengine.wtf.orm import model_fields, model_form  # noqa

flask_mongoengine/wtf/fields.py

@@ -5,8 +5,8 @@
 import sys
 from gettext import gettext as _
 
-from mongoengine.queryset import DoesNotExist
 import six
+from mongoengine.queryset import DoesNotExist
 from wtforms import widgets
 from wtforms.fields import SelectFieldBase, StringField, TextAreaField
 from wtforms.validators import ValidationError

flask_mongoengine/wtf/orm.py

@@ -3,15 +3,9 @@
 """
 import decimal
 import sys
+from collections import OrderedDict
 
 from bson import ObjectId
-
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Use bson's SON implementation instead
-    from bson import SON as OrderedDict
-
 from mongoengine import ReferenceField
 from wtforms import fields as f, validators
 

requirements.txt

@@ -2,7 +2,6 @@ Flask>=0.8
 Flask-DebugToolbar>=0.8
 Flask-WTF>=0.8.3
 mongoengine>=0.8.0
+pymongo>=3.6.0
 flake8
 six
-black
-pre-commit

tests/__init__.py

@@ -1,4 +1,5 @@
 import unittest
+
 import flask
 import mongoengine
 

tests/test_basic_app.py

@@ -1,4 +1,5 @@
 import datetime
+
 import flask
 from bson import ObjectId
 

tests/test_connection.py

@@ -1,13 +1,12 @@
 import mongoengine
+import pymongo
 from mongoengine.context_managers import switch_db
 from nose import SkipTest
 from nose.tools import assert_raises
-import pymongo
 from pymongo.errors import InvalidURI
 from pymongo.read_preferences import ReadPreference
 
 from flask_mongoengine import MongoEngine
-
 from tests import FlaskMongoEngineTestCase
 
 

tests/test_forms.py

@@ -4,9 +4,9 @@
 
 import bson
 import flask
+import wtforms
 from mongoengine import queryset_manager
 from werkzeug.datastructures import MultiDict
-import wtforms
 
 from flask_mongoengine import MongoEngine
 from flask_mongoengine.wtf import model_form

tests/test_json_app.py

@@ -1,4 +1,5 @@
 import datetime
+
 import flask
 from bson import ObjectId
 

tests/test_pagination.py

@@ -1,4 +1,5 @@
 import unittest
+
 from werkzeug.exceptions import NotFound
 
 from flask_mongoengine import ListFieldPagination, MongoEngine, Pagination

tests/test_session.py

@@ -1,6 +1,7 @@
 import unittest
 
 from flask import session
+
 from flask_mongoengine import MongoEngine, MongoEngineSessionInterface
 from tests import FlaskMongoEngineTestCase