apply reorder-python-imports pre-commit config

.pre-commit-config.yaml

@@ -1,4 +1,11 @@
 repos:
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v1.4.0
+    hooks:
+      - id: reorder-python-imports
+        name: Reorder Python imports (src, tests)
+        files: "^(?!examples/)"
+        args: ["--application-directories", ".:src"]
   - repo: https://github.com/python/black
     rev: 19.3b0
     hooks:
@@ -9,7 +16,7 @@ repos:
       - id: flake8
         additional_dependencies: [flake8-bugbear]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v2.2.3
     hooks:
       - id: check-byte-order-marker
       - id: trailing-whitespace

examples/javascript/js_example/views.py

@@ -1,4 +1,6 @@
-from flask import jsonify, render_template, request
+from flask import jsonify
+from flask import render_template
+from flask import request
 
 from js_example import app
 

examples/javascript/setup.py

@@ -1,6 +1,7 @@
 import io
 
-from setuptools import find_packages, setup
+from setuptools import find_packages
+from setuptools import setup
 
 with io.open("README.rst", "rt", encoding="utf8") as f:
     readme = f.read()

examples/javascript/tests/test_js_example.py

@@ -1,5 +1,4 @@
 import pytest
-
 from flask import template_rendered
 
 

examples/tutorial/flaskr/auth.py

@@ -1,16 +1,15 @@
 import functools
 
-from flask import (
+from flask import Blueprint
-    Blueprint,
+from flask import flash
-    flash,
+from flask import g
-    g,
+from flask import redirect
-    redirect,
+from flask import render_template
-    render_template,
+from flask import request
-    request,
+from flask import session
-    session,
+from flask import url_for
-    url_for,
+from werkzeug.security import check_password_hash
-)
+from werkzeug.security import generate_password_hash
-from werkzeug.security import check_password_hash, generate_password_hash
 
 from flaskr.db import get_db
 

examples/tutorial/flaskr/blog.py

@@ -1,4 +1,10 @@
-from flask import Blueprint, flash, g, redirect, render_template, request, url_for
+from flask import Blueprint
+from flask import flash
+from flask import g
+from flask import redirect
+from flask import render_template
+from flask import request
+from flask import url_for
 from werkzeug.exceptions import abort
 
 from flaskr.auth import login_required

examples/tutorial/flaskr/db.py

@@ -1,7 +1,8 @@
 import sqlite3
 
 import click
-from flask import current_app, g
+from flask import current_app
+from flask import g
 from flask.cli import with_appcontext
 
 

examples/tutorial/setup.py

@@ -1,6 +1,7 @@
 import io
 
-from setuptools import find_packages, setup
+from setuptools import find_packages
+from setuptools import setup
 
 with io.open("README.rst", "rt", encoding="utf8") as f:
     readme = f.read()

examples/tutorial/tests/conftest.py

@@ -2,8 +2,10 @@ import os
 import tempfile
 
 import pytest
+
 from flaskr import create_app
-from flaskr.db import get_db, init_db
+from flaskr.db import get_db
+from flaskr.db import init_db
 
 # read in SQL for populating test data
 with open(os.path.join(os.path.dirname(__file__), "data.sql"), "rb") as f:

examples/tutorial/tests/test_auth.py

@@ -1,5 +1,7 @@
 import pytest
-from flask import g, session
+from flask import g
+from flask import session
+
 from flaskr.db import get_db
 
 

examples/tutorial/tests/test_blog.py

@@ -1,4 +1,5 @@
 import pytest
+
 from flaskr.db import get_db
 
 

examples/tutorial/tests/test_db.py

@@ -1,6 +1,7 @@
 import sqlite3
 
 import pytest
+
 from flaskr.db import get_db
 
 

scripts/make-release.py

@@ -4,8 +4,10 @@ from __future__ import print_function
 import os
 import re
 import sys
-from datetime import date, datetime
+from datetime import date
-from subprocess import PIPE, Popen
+from datetime import datetime
+from subprocess import PIPE
+from subprocess import Popen
 
 _date_strip_re = re.compile(r"(?<=\d)(st|nd|rd|th)")
 

src/flask/__init__.py

@@ -9,64 +9,51 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
-__version__ = "1.1.dev"
-
 # utilities we import from Werkzeug and Jinja2 that are unused
 # in the module but are exported as public interface.
+from jinja2 import escape
+from jinja2 import Markup
 from werkzeug.exceptions import abort
 from werkzeug.utils import redirect
-from jinja2 import Markup, escape
 
-from .app import Flask, Request, Response
-from .config import Config
-from .helpers import (
-    url_for,
-    flash,
-    send_file,
-    send_from_directory,
-    get_flashed_messages,
-    get_template_attribute,
-    make_response,
-    safe_join,
-    stream_with_context,
-)
-from .globals import (
-    current_app,
-    g,
-    request,
-    session,
-    _request_ctx_stack,
-    _app_ctx_stack,
-)
-from .ctx import (
-    has_request_context,
-    has_app_context,
-    after_this_request,
-    copy_current_request_context,
-)
-from .blueprints import Blueprint
-from .templating import render_template, render_template_string
-
-# the signals
-from .signals import (
-    signals_available,
-    template_rendered,
-    request_started,
-    request_finished,
-    got_request_exception,
-    request_tearing_down,
-    appcontext_tearing_down,
-    appcontext_pushed,
-    appcontext_popped,
-    message_flashed,
-    before_render_template,
-)
-
-# We're not exposing the actual json module but a convenient wrapper around
-# it.
 from . import json
+from .app import Flask
+from .app import Request
+from .app import Response
+from .blueprints import Blueprint
+from .config import Config
+from .ctx import after_this_request
+from .ctx import copy_current_request_context
+from .ctx import has_app_context
+from .ctx import has_request_context
+from .globals import _app_ctx_stack
+from .globals import _request_ctx_stack
+from .globals import current_app
+from .globals import g
+from .globals import request
+from .globals import session
+from .helpers import flash
+from .helpers import get_flashed_messages
+from .helpers import get_template_attribute
+from .helpers import make_response
+from .helpers import safe_join
+from .helpers import send_file
+from .helpers import send_from_directory
+from .helpers import stream_with_context
+from .helpers import url_for
+from .json import jsonify
+from .signals import appcontext_popped
+from .signals import appcontext_pushed
+from .signals import appcontext_tearing_down
+from .signals import before_render_template
+from .signals import got_request_exception
+from .signals import message_flashed
+from .signals import request_finished
+from .signals import request_started
+from .signals import request_tearing_down
+from .signals import signals_available
+from .signals import template_rendered
+from .templating import render_template
+from .templating import render_template_string
 
-# This was the only thing that Flask used to export at one point and it had
+__version__ = "1.1.dev"
-# a more generic name.
-jsonify = json.jsonify

src/flask/_compat.py

@@ -10,7 +10,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import sys
 
 PY2 = sys.version_info[0] == 2

src/flask/app.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import os
 import sys
 import warnings
@@ -17,50 +16,58 @@ from functools import update_wrapper
 from itertools import chain
 from threading import Lock
 
-from werkzeug.datastructures import Headers, ImmutableDict
+from werkzeug.datastructures import Headers
-from werkzeug.exceptions import (
+from werkzeug.datastructures import ImmutableDict
-    BadRequest,
+from werkzeug.exceptions import BadRequest
-    BadRequestKeyError,
+from werkzeug.exceptions import BadRequestKeyError
-    HTTPException,
+from werkzeug.exceptions import default_exceptions
-    InternalServerError,
+from werkzeug.exceptions import HTTPException
-    MethodNotAllowed,
+from werkzeug.exceptions import InternalServerError
-    default_exceptions,
+from werkzeug.exceptions import MethodNotAllowed
-)
+from werkzeug.routing import BuildError
-from werkzeug.routing import BuildError, Map, RequestRedirect, RoutingException, Rule
+from werkzeug.routing import Map
+from werkzeug.routing import RequestRedirect
+from werkzeug.routing import RoutingException
+from werkzeug.routing import Rule
 from werkzeug.wrappers import BaseResponse
 
-from . import cli, json
+from . import cli
-from ._compat import integer_types, reraise, string_types, text_type
+from . import json
-from .config import Config, ConfigAttribute
+from ._compat import integer_types
-from .ctx import AppContext, RequestContext, _AppCtxGlobals
+from ._compat import reraise
-from .globals import _request_ctx_stack, g, request, session
+from ._compat import string_types
-from .helpers import (
+from ._compat import text_type
-    _PackageBoundObject,
+from .config import Config
-    _endpoint_from_view_func,
+from .config import ConfigAttribute
-    find_package,
+from .ctx import _AppCtxGlobals
-    get_env,
+from .ctx import AppContext
-    get_debug_flag,
+from .ctx import RequestContext
-    get_flashed_messages,
+from .globals import _request_ctx_stack
-    locked_cached_property,
+from .globals import g
-    url_for,
+from .globals import request
-    get_load_dotenv,
+from .globals import session
-)
+from .helpers import _endpoint_from_view_func
+from .helpers import _PackageBoundObject
+from .helpers import find_package
+from .helpers import get_debug_flag
+from .helpers import get_env
+from .helpers import get_flashed_messages
+from .helpers import get_load_dotenv
+from .helpers import locked_cached_property
+from .helpers import url_for
 from .json import jsonify
 from .logging import create_logger
 from .sessions import SecureCookieSessionInterface
-from .signals import (
+from .signals import appcontext_tearing_down
-    appcontext_tearing_down,
+from .signals import got_request_exception
-    got_request_exception,
+from .signals import request_finished
-    request_finished,
+from .signals import request_started
-    request_started,
+from .signals import request_tearing_down
-    request_tearing_down,
+from .templating import _default_template_ctx_processor
-)
+from .templating import DispatchingJinjaLoader
-from .templating import (
+from .templating import Environment
-    DispatchingJinjaLoader,
+from .wrappers import Request
-    Environment,
+from .wrappers import Response
-    _default_template_ctx_processor,
-)
-from .wrappers import Request, Response
 
 # a singleton sentinel value for parameter defaults
 _sentinel = object()
@@ -1036,7 +1043,7 @@ class Flask(_PackageBoundObject):
         """
         cls = self.test_client_class
         if cls is None:
-            from flask.testing import FlaskClient as cls
+            from .testing import FlaskClient as cls
         return cls(self, self.response_class, use_cookies=use_cookies, **kwargs)
 
     def test_cli_runner(self, **kwargs):
@@ -1052,7 +1059,7 @@ class Flask(_PackageBoundObject):
         cls = self.test_cli_runner_class
 
         if cls is None:
-            from flask.testing import FlaskCliRunner as cls
+            from .testing import FlaskCliRunner as cls
 
         return cls(self, **kwargs)
 
@@ -2356,7 +2363,7 @@ class Flask(_PackageBoundObject):
         :param kwargs: other keyword arguments passed to
             :class:`~werkzeug.test.EnvironBuilder`.
         """
-        from flask.testing import EnvironBuilder
+        from .testing import EnvironBuilder
 
         builder = EnvironBuilder(self, *args, **kwargs)
 

src/flask/blueprints.py

@@ -11,7 +11,8 @@
 """
 from functools import update_wrapper
 
-from .helpers import _PackageBoundObject, _endpoint_from_view_func
+from .helpers import _endpoint_from_view_func
+from .helpers import _PackageBoundObject
 
 # a singleton sentinel value for parameter defaults
 _sentinel = object()

src/flask/cli.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 from __future__ import print_function
 
 import ast
@@ -20,15 +19,20 @@ import sys
 import traceback
 from functools import update_wrapper
 from operator import attrgetter
-from threading import Lock, Thread
+from threading import Lock
+from threading import Thread
 
 import click
 from werkzeug.utils import import_string
 
-from . import __version__
+from ._compat import getargspec
-from ._compat import getargspec, itervalues, reraise, text_type
+from ._compat import itervalues
+from ._compat import reraise
+from ._compat import text_type
 from .globals import current_app
-from .helpers import get_debug_flag, get_env, get_load_dotenv
+from .helpers import get_debug_flag
+from .helpers import get_env
+from .helpers import get_load_dotenv
 
 try:
     import dotenv
@@ -147,7 +151,7 @@ def find_app_by_string(script_info, module, app_name):
     ``script_info`` argument and calls the function with the appropriate
     arguments.
     """
-    from flask import Flask
+    from . import Flask
 
     match = re.match(r"^ *([^ ()]+) *(?:\((.*?) *,? *\))? *$", app_name)
 
@@ -258,7 +262,9 @@ def locate_app(script_info, module_name, app_name, raise_if_not_found=True):
 def get_version(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
+
     import werkzeug
+    from . import __version__
 
     message = "Python %(python)s\n" "Flask %(flask)s\n" "Werkzeug %(werkzeug)s"
     click.echo(
@@ -865,7 +871,7 @@ def shell_command():
     without having to manually configure the application.
     """
     import code
-    from flask.globals import _app_ctx_stack
+    from .globals import _app_ctx_stack
 
     app = _app_ctx_stack.top.app
     banner = "Python %s on %s\nApp: %s [%s]\nInstance: %s" % (

src/flask/config.py

@@ -8,14 +8,15 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
+import errno
 import os
 import types
-import errno
 
 from werkzeug.utils import import_string
-from ._compat import string_types, iteritems
+
 from . import json
+from ._compat import iteritems
+from ._compat import string_types
 
 
 class ConfigAttribute(object):

src/flask/ctx.py

@@ -8,15 +8,17 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import sys
 from functools import update_wrapper
 
 from werkzeug.exceptions import HTTPException
 
-from .globals import _request_ctx_stack, _app_ctx_stack
+from ._compat import BROKEN_PYPY_CTXMGR_EXIT
-from .signals import appcontext_pushed, appcontext_popped
+from ._compat import reraise
-from ._compat import BROKEN_PYPY_CTXMGR_EXIT, reraise
+from .globals import _app_ctx_stack
+from .globals import _request_ctx_stack
+from .signals import appcontext_popped
+from .signals import appcontext_pushed
 
 
 # a singleton sentinel value for parameter defaults

src/flask/debughelpers.py

@@ -8,11 +8,11 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import os
 from warnings import warn
 
-from ._compat import implements_to_string, text_type
+from ._compat import implements_to_string
+from ._compat import text_type
 from .app import Flask
 from .blueprints import Blueprint
 from .globals import _request_ctx_stack

src/flask/globals.py

@@ -9,9 +9,10 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 from functools import partial
-from werkzeug.local import LocalStack, LocalProxy
+
+from werkzeug.local import LocalProxy
+from werkzeug.local import LocalStack
 
 
 _request_ctx_err_msg = """\

src/flask/helpers.py

@@ -9,29 +9,37 @@
     :license: BSD, see LICENSE for more details.
 """
 import io
+import mimetypes
 import os
-import socket
-import sys
 import pkgutil
 import posixpath
-import mimetypes
+import socket
+import sys
+import unicodedata
+from functools import update_wrapper
+from threading import RLock
 from time import time
 from zlib import adler32
-from threading import RLock
-import unicodedata
-from werkzeug.routing import BuildError
-from functools import update_wrapper
 
-from werkzeug.urls import url_quote
-from werkzeug.datastructures import Headers
-from werkzeug.exceptions import BadRequest, NotFound, RequestedRangeNotSatisfiable
-
-from werkzeug.wsgi import wrap_file
 from jinja2 import FileSystemLoader
+from werkzeug.datastructures import Headers
+from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import NotFound
+from werkzeug.exceptions import RequestedRangeNotSatisfiable
+from werkzeug.routing import BuildError
+from werkzeug.urls import url_quote
+from werkzeug.wsgi import wrap_file
 
+from ._compat import fspath
+from ._compat import PY2
+from ._compat import string_types
+from ._compat import text_type
+from .globals import _app_ctx_stack
+from .globals import _request_ctx_stack
+from .globals import current_app
+from .globals import request
+from .globals import session
 from .signals import message_flashed
-from .globals import session, _request_ctx_stack, _app_ctx_stack, current_app, request
-from ._compat import string_types, text_type, PY2, fspath
 
 # sentinel
 _missing = object()

src/flask/json/__init__.py

@@ -9,16 +9,17 @@ flask.json
 import codecs
 import io
 import uuid
-from datetime import date, datetime
+from datetime import date
-from flask.globals import current_app, request
+from datetime import datetime
-from flask._compat import text_type, PY2
 
-from werkzeug.http import http_date
-from jinja2 import Markup
-
-# Use the same json implementation as itsdangerous on which we
-# depend anyways.
 from itsdangerous import json as _json
+from jinja2 import Markup
+from werkzeug.http import http_date
+
+from .._compat import PY2
+from .._compat import text_type
+from ..globals import current_app
+from ..globals import request
 
 try:
     import dataclasses

src/flask/json/tag.py

@@ -41,16 +41,19 @@ processes dicts first, so insert the new tag at the front of the order since
 :copyright: © 2010 by the Pallets team.
 :license: BSD, see LICENSE for more details.
 """
-
+from base64 import b64decode
-from base64 import b64decode, b64encode
+from base64 import b64encode
 from datetime import datetime
 from uuid import UUID
 
 from jinja2 import Markup
-from werkzeug.http import http_date, parse_date
+from werkzeug.http import http_date
+from werkzeug.http import parse_date
 
-from flask._compat import iteritems, text_type
+from .._compat import iteritems
-from flask.json import dumps, loads
+from .._compat import text_type
+from ..json import dumps
+from ..json import loads
 
 
 class JSONTag(object):

src/flask/logging.py

@@ -6,7 +6,6 @@ flask.logging
 :copyright: © 2010 by the Pallets team.
 :license: BSD, see LICENSE for more details.
 """
-
 from __future__ import absolute_import
 
 import logging

src/flask/sessions.py

@@ -8,17 +8,18 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import hashlib
 import warnings
 from datetime import datetime
 
-from itsdangerous import BadSignature, URLSafeTimedSerializer
+from itsdangerous import BadSignature
+from itsdangerous import URLSafeTimedSerializer
 from werkzeug.datastructures import CallbackDict
 
-from flask._compat import collections_abc
+from ._compat import collections_abc
-from flask.helpers import is_ip, total_seconds
+from .helpers import is_ip
-from flask.json.tag import TaggedJSONSerializer
+from .helpers import total_seconds
+from .json.tag import TaggedJSONSerializer
 
 
 class SessionMixin(collections_abc.MutableMapping):

src/flask/signals.py

@@ -9,13 +9,12 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
-signals_available = False
 try:
     from blinker import Namespace
 
     signals_available = True
 except ImportError:
+    signals_available = False
 
     class Namespace(object):
         def signal(self, name, doc=None):

src/flask/templating.py

@@ -8,11 +8,14 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
+from jinja2 import BaseLoader
+from jinja2 import Environment as BaseEnvironment
+from jinja2 import TemplateNotFound
 
-from jinja2 import BaseLoader, Environment as BaseEnvironment, TemplateNotFound
+from .globals import _app_ctx_stack
-
+from .globals import _request_ctx_stack
-from .globals import _request_ctx_stack, _app_ctx_stack
+from .signals import before_render_template
-from .signals import template_rendered, before_render_template
+from .signals import template_rendered
 
 
 def _default_template_ctx_processor():

src/flask/testing.py

@@ -10,17 +10,17 @@
     :license: BSD, see LICENSE for more details.
 """
 import warnings
-import werkzeug
-import werkzeug.test
 from contextlib import contextmanager
 
+import werkzeug.test
 from click.testing import CliRunner
-from flask.cli import ScriptInfo
 from werkzeug.test import Client
-from flask import _request_ctx_stack
-from flask.json import dumps as json_dumps
 from werkzeug.urls import url_parse
 
+from . import _request_ctx_stack
+from .cli import ScriptInfo
+from .json import dumps as json_dumps
+
 
 class EnvironBuilder(werkzeug.test.EnvironBuilder):
     """An :class:`~werkzeug.test.EnvironBuilder`, that takes defaults from the

src/flask/views.py

@@ -8,9 +8,8 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
-from .globals import request
 from ._compat import with_metaclass
+from .globals import request
 
 
 http_method_funcs = frozenset(

src/flask/wrappers.py

@@ -8,13 +8,13 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 from werkzeug.exceptions import BadRequest
-from werkzeug.wrappers import Request as RequestBase, Response as ResponseBase
+from werkzeug.wrappers import Request as RequestBase
+from werkzeug.wrappers import Response as ResponseBase
 from werkzeug.wrappers.json import JSONMixin as _JSONMixin
 
-from flask import json
+from . import json
-from flask.globals import current_app
+from .globals import current_app
 
 
 class JSONMixin(_JSONMixin):

tests/conftest.py

@@ -6,7 +6,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import gc
 import os
 import pkgutil

tests/test_appctx.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import pytest
 
 import flask

tests/test_apps/blueprintapp/apps/admin/__init__.py

@@ -1,4 +1,5 @@
-from flask import Blueprint, render_template
+from flask import Blueprint
+from flask import render_template
 
 admin = Blueprint(
     "admin",

tests/test_apps/blueprintapp/apps/frontend/__init__.py

@@ -1,4 +1,5 @@
-from flask import Blueprint, render_template
+from flask import Blueprint
+from flask import render_template
 
 frontend = Blueprint("frontend", __name__, template_folder="templates")
 

tests/test_apps/cliapp/app.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from flask import Flask
 

tests/test_apps/cliapp/factory.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from flask import Flask
 

tests/test_apps/cliapp/importerrorapp.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from flask import Flask
 

tests/test_apps/cliapp/multiapp.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from flask import Flask
 

tests/test_basic.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import re
 import sys
 import time
@@ -18,7 +17,9 @@ from threading import Thread
 
 import pytest
 import werkzeug.serving
-from werkzeug.exceptions import BadRequest, Forbidden, NotFound
+from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import Forbidden
+from werkzeug.exceptions import NotFound
 from werkzeug.http import parse_date
 from werkzeug.routing import BuildError
 

tests/test_blueprints.py

@@ -8,15 +8,14 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import functools
+
 import pytest
+from jinja2 import TemplateNotFound
+from werkzeug.http import parse_cache_control_header
 
 import flask
-
 from flask._compat import text_type
-from werkzeug.http import parse_cache_control_header
-from jinja2 import TemplateNotFound
 
 
 def test_blueprint_specific_error_handling(app, client):

tests/test_cli.py

@@ -6,10 +6,8 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 # This file was part of Flask-CLI and was modified under the terms of
 # its Revised BSD License. Copyright © 2015 CERN.
-
 from __future__ import absolute_import
 
 import os
@@ -23,21 +21,21 @@ import pytest
 from _pytest.monkeypatch import notset
 from click.testing import CliRunner
 
-from flask import Flask, current_app, Blueprint
+from flask import Blueprint
-from flask.cli import (
+from flask import current_app
-    AppGroup,
+from flask import Flask
-    FlaskGroup,
+from flask.cli import AppGroup
-    NoAppException,
+from flask.cli import dotenv
-    ScriptInfo,
+from flask.cli import find_best_app
-    dotenv,
+from flask.cli import FlaskGroup
-    find_best_app,
+from flask.cli import get_version
-    get_version,
+from flask.cli import load_dotenv
-    load_dotenv,
+from flask.cli import locate_app
-    locate_app,
+from flask.cli import NoAppException
-    prepare_import,
+from flask.cli import prepare_import
-    run_command,
+from flask.cli import run_command
-    with_appcontext,
+from flask.cli import ScriptInfo
-)
+from flask.cli import with_appcontext
 
 cwd = os.getcwd()
 test_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "test_apps"))

tests/test_config.py

@@ -6,14 +6,14 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
-from datetime import timedelta
 import os
 import textwrap
+from datetime import timedelta
+
+import pytest
 
 import flask
 from flask._compat import PY2
-import pytest
 
 
 # config keys used for the TestConfig

tests/test_helpers.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import datetime
 import io
 import os
@@ -16,13 +15,18 @@ import uuid
 
 import pytest
 from werkzeug.datastructures import Range
-from werkzeug.exceptions import BadRequest, NotFound
+from werkzeug.exceptions import BadRequest
-from werkzeug.http import http_date, parse_cache_control_header, parse_options_header
+from werkzeug.exceptions import NotFound
+from werkzeug.http import http_date
+from werkzeug.http import parse_cache_control_header
+from werkzeug.http import parse_options_header
 
 import flask
 from flask import json
-from flask._compat import StringIO, text_type
+from flask._compat import StringIO
-from flask.helpers import get_debug_flag, get_env
+from flask._compat import text_type
+from flask.helpers import get_debug_flag
+from flask.helpers import get_env
 
 
 def has_encoding(name):

tests/test_instance_config.py

@@ -6,11 +6,11 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import os
 import sys
 
 import pytest
+
 import flask
 from flask._compat import PY2
 

tests/test_json_tag.py

@@ -6,14 +6,14 @@ tests.test_json_tag
 :copyright: © 2010 by the Pallets team.
 :license: BSD, see LICENSE for more details.
 """
-
 from datetime import datetime
 from uuid import uuid4
 
 import pytest
 
 from flask import Markup
-from flask.json.tag import TaggedJSONSerializer, JSONTag
+from flask.json.tag import JSONTag
+from flask.json.tag import TaggedJSONSerializer
 
 
 @pytest.mark.parametrize(

tests/test_logging.py

@@ -6,14 +6,15 @@ tests.test_logging
 :copyright: © 2010 by the Pallets team.
 :license: BSD, see LICENSE for more details.
 """
-
 import logging
 import sys
 
 import pytest
 
 from flask._compat import StringIO
-from flask.logging import default_handler, has_level_handler, wsgi_errors_stream
+from flask.logging import default_handler
+from flask.logging import has_level_handler
+from flask.logging import wsgi_errors_stream
 
 
 @pytest.fixture(autouse=True)

tests/test_regression.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import gc
 import sys
 import threading

tests/test_reqctx.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import pytest
 
 import flask

tests/test_signals.py

@@ -8,7 +8,6 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import pytest
 
 try:

tests/test_subclassing.py

@@ -9,9 +9,7 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import flask
-
 from flask._compat import StringIO
 
 

tests/test_templating.py

@@ -8,13 +8,13 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
+import logging
 
 import pytest
+import werkzeug.serving
+from jinja2 import TemplateNotFound
 
 import flask
-import logging
-from jinja2 import TemplateNotFound
-import werkzeug.serving
 
 
 def test_context_processing(app, client):

tests/test_testing.py

@@ -10,15 +10,16 @@
 """
 import click
 import pytest
-
-import flask
 import werkzeug
 
+import flask
 from flask import appcontext_popped
 from flask._compat import text_type
 from flask.cli import ScriptInfo
 from flask.json import jsonify
-from flask.testing import make_test_environ_builder, FlaskCliRunner, EnvironBuilder
+from flask.testing import EnvironBuilder
+from flask.testing import FlaskCliRunner
+from flask.testing import make_test_environ_builder
 
 try:
     import blinker

tests/test_user_error_handler.py

@@ -6,8 +6,11 @@ tests.test_user_error_handler
 :copyright: © 2010 by the Pallets team.
 :license: BSD, see LICENSE for more details.
 """
+from werkzeug.exceptions import Forbidden
+from werkzeug.exceptions import HTTPException
+from werkzeug.exceptions import InternalServerError
+from werkzeug.exceptions import NotFound
 
-from werkzeug.exceptions import Forbidden, InternalServerError, HTTPException, NotFound
 import flask
 
 

tests/test_views.py

@@ -8,11 +8,9 @@
     :copyright: © 2010 by the Pallets team.
     :license: BSD, see LICENSE for more details.
 """
-
 import pytest
 from werkzeug.http import parse_set_header
 
-import flask
 import flask.views