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 (
-    Blueprint,
-    flash,
-    g,
-    redirect,
-    render_template,
-    request,
-    session,
-    url_for,
-)
-from werkzeug.security import check_password_hash, generate_password_hash
+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 session
+from flask import url_for
+from werkzeug.security import check_password_hash
+from werkzeug.security import 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 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 @@
 import os
 import re
 import sys
-from datetime import date, datetime
-from subprocess import PIPE, Popen
+from datetime import date
+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
-# a more generic name.
-jsonify = json.jsonify
+__version__ = "1.1.dev"

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 itertools import chain
 from threading import Lock
 
-from werkzeug.datastructures import Headers, ImmutableDict
-from werkzeug.exceptions import (
-    BadRequest,
-    BadRequestKeyError,
-    HTTPException,
-    InternalServerError,
-    MethodNotAllowed,
-    default_exceptions,
-)
-from werkzeug.routing import BuildError, Map, RequestRedirect, RoutingException, Rule
+from werkzeug.datastructures import Headers
+from werkzeug.datastructures import ImmutableDict
+from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequestKeyError
+from werkzeug.exceptions import default_exceptions
+from werkzeug.exceptions import HTTPException
+from werkzeug.exceptions import InternalServerError
+from werkzeug.exceptions import MethodNotAllowed
+from werkzeug.routing import BuildError
+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 ._compat import integer_types, reraise, string_types, text_type
-from .config import Config, ConfigAttribute
-from .ctx import AppContext, RequestContext, _AppCtxGlobals
-from .globals import _request_ctx_stack, g, request, session
-from .helpers import (
-    _PackageBoundObject,
-    _endpoint_from_view_func,
-    find_package,
-    get_env,
-    get_debug_flag,
-    get_flashed_messages,
-    locked_cached_property,
-    url_for,
-    get_load_dotenv,
-)
+from . import cli
+from . import json
+from ._compat import integer_types
+from ._compat import reraise
+from ._compat import string_types
+from ._compat import text_type
+from .config import Config
+from .config import ConfigAttribute
+from .ctx import _AppCtxGlobals
+from .ctx import AppContext
+from .ctx import RequestContext
+from .globals import _request_ctx_stack
+from .globals import g
+from .globals import request
+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 (
-    appcontext_tearing_down,
-    got_request_exception,
-    request_finished,
-    request_started,
-    request_tearing_down,
-)
-from .templating import (
-    DispatchingJinjaLoader,
-    Environment,
-    _default_template_ctx_processor,
-)
-from .wrappers import Request, Response
+from .signals import appcontext_tearing_down
+from .signals import got_request_exception
+from .signals import request_finished
+from .signals import request_started
+from .signals import request_tearing_down
+from .templating import _default_template_ctx_processor
+from .templating import DispatchingJinjaLoader
+from .templating import Environment
+from .wrappers import Request
+from .wrappers import Response
 
 # a singleton sentinel value for parameter defaults
 _sentinel = object()
@@ -1036,7 +1043,7 @@ def __init__(self, *args, **kwargs):
         """
         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 @@ def test_cli_runner(self, **kwargs):
         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 @@ def test_request_context(self, *args, **kwargs):
         :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)