ignore less flake8 errors + add flake8-import-order + minor style tweaks

Author: wojcikstefan

flask_mongoengine/__init__.py

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 import inspect
-import mongoengine
 
 from flask import abort, current_app
+import mongoengine
+from mongoengine.base import ValidationError
 from mongoengine.base.fields import BaseField
-from mongoengine.queryset import (MultipleObjectsReturned,
-                                  DoesNotExist, QuerySet)
+from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
+                                  QuerySet)
 
-from mongoengine.base import ValidationError
-from .sessions import *
-from .pagination import *
-from .metadata import *
+from .connection import *
 from .json import override_json_encoder
+from .metadata import *
+from .pagination import *
+from .sessions import *
 from .wtf import WtfBaseField
-from .connection import *
+
 
 def redirect_connection_calls(cls):
     """
@@ -25,9 +26,9 @@ def redirect_connection_calls(cls):
     # Proxy all 'mongoengine.connection'
     # specific attr via 'flask_mongoengine'
     connection_methods = {
-        'get_db' : get_db,
-        'DEFAULT_CONNECTION_NAME' : DEFAULT_CONNECTION_NAME,
-        'get_connection' : get_connection
+        'get_db': get_db,
+        'DEFAULT_CONNECTION_NAME': DEFAULT_CONNECTION_NAME,
+        'get_connection': get_connection
     }
 
     cls_module = inspect.getmodule(cls)
@@ -37,6 +38,7 @@ def redirect_connection_calls(cls):
             if connection_methods.get(n, None):
                 setattr(cls_module, n, connection_methods.get(n, None))
 
+
 def _patch_base_field(obj, name):
     """
     If the object submitted has a class whose base class is
@@ -75,6 +77,7 @@ def _patch_base_field(obj, name):
     setattr(obj, name, cls)
     redirect_connection_calls(cls)
 
+
 def _include_mongoengine(obj):
     for module in mongoengine, mongoengine.fields:
         for key in module.__all__:
@@ -84,6 +87,7 @@ def _include_mongoengine(obj):
                 # patch BaseField if available
                 _patch_base_field(obj, key)
 
+
 def current_mongoengine_instance():
     """
     Obtain instance of MongoEngine in the
@@ -98,6 +102,7 @@ def current_mongoengine_instance():
                 return k
     return None
 
+
 class MongoEngine(object):
 
     def __init__(self, app=None, config=None):
@@ -188,6 +193,7 @@ def paginate_field(self, field_name, doc_id, page, per_page,
         return ListFieldPagination(self, doc_id, field_name, page, per_page,
                                    total=total)
 
+
 class Document(mongoengine.Document):
     """Abstract document with extra helpers in the queryset class"""
 

flask_mongoengine/connection.py

@@ -1,17 +1,16 @@
 import atexit
 import os.path
-import mongoengine
 import shutil
 import subprocess
 import sys
 import tempfile
 import time
 
 from flask import current_app
+import mongoengine
+from mongoengine import connection
 from pymongo import MongoClient, ReadPreference, errors
-from subprocess import Popen, PIPE
 from pymongo.errors import InvalidURI
-from mongoengine import connection
 
 __all__ = (
     'create_connection', 'disconnect', 'get_connection',
@@ -28,12 +27,15 @@
 _process = None
 _app_instance = current_app
 
+
 class InvalidSettingsError(Exception):
     pass
 
+
 class ConnectionError(Exception):
     pass
 
+
 def disconnect(alias=DEFAULT_CONNECTION_NAME, preserved=False):
     global _connections, _process, _tmpdir
 
@@ -58,6 +60,7 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME, preserved=False):
         if os.path.exists(sock_file):
             os.remove("{0}/{1}".format(tempfile.gettempdir(), sock_file))
 
+
 def _validate_settings(is_test, temp_db, preserved, conn_host):
     """
     Validate unitest settings to ensure
@@ -81,11 +84,13 @@ def _validate_settings(is_test, temp_db, preserved, conn_host):
                'only when `TESTING` is set to true.')
         raise InvalidSettingsError(msg)
 
+
 def __get_app_config(key):
     return (_app_instance.get(key, False)
             if isinstance(_app_instance, dict)
             else _app_instance.config.get(key, False))
 
+
 def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
     global _connections
     set_global_attributes()
@@ -175,25 +180,30 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
 
     return mongoengine.connection.get_db(alias)
 
+
 def _sys_exec(cmd, shell=True, env=None):
     if env is None:
         env = os.environ
 
-    a = Popen(cmd, shell=shell, stdout=PIPE, stderr=PIPE, env=env)
+    a = subprocess.Popen(cmd, shell=shell, stdout=subprocess.PIPE,
+                         stderr=subprocess.PIPE, env=env)
     a.wait()  # Wait for process to terminate
     if a.returncode:  # Not 0 => Error has occured
         raise Exception(a.communicate()[1])
     return a.communicate()[0]
 
+
 def set_global_attributes():
     setattr(connection, '_connection_settings', _connection_settings)
     setattr(connection, '_connections', _connections)
     setattr(connection, 'disconnect', disconnect)
 
+
 def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
     set_global_attributes()
     return connection.get_db(alias, reconnect)
 
+
 def _register_test_connection(port, db_alias, preserved):
     global _process, _tmpdir
 
@@ -248,6 +258,7 @@ def _register_test_connection(port, db_alias, preserved):
             _connections[db_alias] = _conn
         return _conn
 
+
 def _resolve_settings(conn_setting, removePass=True):
 
     if conn_setting and isinstance(conn_setting, dict):
@@ -295,6 +306,7 @@ def _resolve_settings(conn_setting, removePass=True):
         return resolved
     return conn_setting
 
+
 def fetch_connection_settings(config, removePass=True):
     """
     Fetch DB connection settings from FlaskMongoEngine
@@ -328,6 +340,7 @@ def fetch_connection_settings(config, removePass=True):
         # Connection settings provided in standard format.
         return _resolve_settings(config, removePass)
 
+
 def create_connection(config, app):
     """
     Connection is created based on application configuration

flask_mongoengine/json.py

@@ -1,8 +1,9 @@
-from flask.json import JSONEncoder
 from bson import json_util
+from flask.json import JSONEncoder
 from mongoengine.base import BaseDocument
 from mongoengine.queryset import QuerySet
 
+
 def _make_encoder(superclass):
     class MongoEngineJSONEncoder(superclass):
         '''
@@ -18,6 +19,7 @@ def default(self, obj):
     return MongoEngineJSONEncoder
 MongoEngineJSONEncoder = _make_encoder(JSONEncoder)
 
+
 def override_json_encoder(app):
     '''
     A function to dynamically create a new MongoEngineJSONEncoder class

flask_mongoengine/metadata.py

@@ -8,6 +8,7 @@
     unicode = unicode
     basestring = basestring
 
+
 def get_version():
     if isinstance(VERSION[-1], basestring):
         return '.'.join(map(str, VERSION[:-1])) + VERSION[-1]

flask_mongoengine/operation_tracker.py

@@ -1,19 +1,19 @@
+import copy
 import functools
-import time
 import inspect
-import copy
-import sys
 import os
+import sys
+import time
 try:
     import SocketServer
 except ImportError:
     import socketserver as SocketServer
 
+import bson
 import pymongo.collection
 import pymongo.cursor
 import pymongo.helpers
 
-from bson import SON
 
 __all__ = ['queries', 'inserts', 'updates', 'removes', 'install_tracker',
            'uninstall_tracker', 'reset', 'response_sizes']
@@ -35,6 +35,7 @@
 if sys.version_info >= (3, 0):
     unicode = str
 
+
 # Wrap helpers._unpack_response for getting response size
 @functools.wraps(_original_methods['_unpack_response'])
 def _unpack_response(response, *args, **kwargs):
@@ -47,6 +48,7 @@ def _unpack_response(response, *args, **kwargs):
     response_sizes.append(sys.getsizeof(response, len(response)) / 1024.0)
     return result
 
+
 # Wrap Cursor.insert for getting queries
 @functools.wraps(_original_methods['insert'])
 def _insert(collection_self, doc_or_docs, manipulate=True,
@@ -71,6 +73,7 @@ def _insert(collection_self, doc_or_docs, manipulate=True,
     })
     return result
 
+
 # Wrap Cursor.update for getting queries
 @functools.wraps(_original_methods['update'])
 def _update(collection_self, spec, document, upsert=False,
@@ -100,6 +103,7 @@ def _update(collection_self, spec, document, upsert=False,
     })
     return result
 
+
 # Wrap Cursor.remove for getting queries
 @functools.wraps(_original_methods['remove'])
 def _remove(collection_self, spec_or_id, safe=None, **kwargs):
@@ -122,6 +126,7 @@ def _remove(collection_self, spec_or_id, safe=None, **kwargs):
     })
     return result
 
+
 # Wrap Cursor._refresh for getting queries
 @functools.wraps(_original_methods['refresh'])
 def _cursor_refresh(cursor_self):
@@ -142,7 +147,7 @@ def privar(name):
     total_time = (time.time() - start_time) * 1000
 
     query_son = privar('query_spec')()
-    if not isinstance(query_son, SON):
+    if not isinstance(query_son, bson.SON):
 
         if "$query" not in query_son:
             query_son = {"$query": query_son}
@@ -203,6 +208,7 @@ def privar(name):
 
     return result
 
+
 def install_tracker():
     if pymongo.collection.Collection.insert != _insert:
         pymongo.collection.Collection.insert = _insert
@@ -215,6 +221,7 @@ def install_tracker():
     if pymongo.helpers._unpack_response != _unpack_response:
         pymongo.helpers._unpack_response = _unpack_response
 
+
 def uninstall_tracker():
     if pymongo.collection.Collection.insert == _insert:
         pymongo.collection.Collection.insert = _original_methods['insert']
@@ -227,6 +234,7 @@ def uninstall_tracker():
     if pymongo.helpers._unpack_response == _unpack_response:
         pymongo.helpers._unpack_response = _original_methods['_unpack_response']
 
+
 def reset():
     global queries, inserts, updates, removes, response_sizes
     queries = []
@@ -235,6 +243,7 @@ def reset():
     removes = []
     response_sizes = []
 
+
 def _get_ordering(son):
     """Helper function to extract formatted ordering from dict.
     """
@@ -244,6 +253,7 @@ def fmt(field, direction):
     if '$orderby' in son:
         return ', '.join(fmt(f, d) for f, d in son['$orderby'].items())
 
+
 def _tidy_stacktrace():
     """
     Tidy the stack_trace

flask_mongoengine/pagination.py

@@ -6,6 +6,7 @@
 
 __all__ = ("Pagination", "ListFieldPagination")
 
+
 class Pagination(object):
 
     def __init__(self, iterable, page, per_page):
@@ -102,18 +103,22 @@ def iter_pages(self, left_edge=2, left_current=2,
             {% endmacro %}
         """
         last = 0
-        for num in range(1, self.pages + 1) if sys.version_info >= (3, 0) else xrange(1, self.pages + 1):
-            if (num <= left_edge or
+        range_func = range if sys.version_info >= (3, 0) else xrange
+        for num in range_func(1, self.pages + 1):
+            if (
+                num <= left_edge or
+                num > self.pages - right_edge or
                 (num >= self.page - left_current and
-                 num <= self.page + right_current) or
-                num > self.pages - right_edge):
+                 num <= self.page + right_current)
+            ):
                 if last + 1 != num:
                     yield None
                 yield num
                 last = num
         if last != self.pages:
             yield None
 
+
 class ListFieldPagination(Pagination):
 
     def __init__(self, queryset, doc_id, field_name, page, per_page,

flask_mongoengine/panels.py

@@ -1,13 +1,13 @@
 from flask import current_app
-
 from flask_debugtoolbar.panels import DebugPanel
-from jinja2 import PackageLoader, ChoiceLoader
+from jinja2 import ChoiceLoader, PackageLoader
+
 from flask_mongoengine import operation_tracker
 
-_ = lambda x: x
 
 package_loader = PackageLoader('flask_mongoengine', 'templates')
 
+
 def _maybe_patch_jinja_loader(jinja_env):
     """Patch the jinja_env loader to include flaskext.mongoengine
     templates folder if necessary.
@@ -17,6 +17,7 @@ def _maybe_patch_jinja_loader(jinja_env):
     elif package_loader not in jinja_env.loader.loaders:
         jinja_env.loader.loaders.append(package_loader)
 
+
 class MongoDebugPanel(DebugPanel):
     """Panel that shows information about MongoDB operations (including stack)