Skip to content

Commit edc4723

Browse files
committed
Use isort for import formatting
1 parent 30eda1d commit edc4723

File tree

10 files changed

+27
-14
lines changed

10 files changed

+27
-14
lines changed

.isort.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[isort]
2+
line_length=120
3+
multi_line_output=0
4+
lines_after_imports=2

flask_pluginengine/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
from .engine import PluginEngine
88
from .globals import current_plugin
9-
from .mixins import (PluginBlueprintSetupState, PluginBlueprintSetupStateMixin, PluginBlueprint, PluginBlueprintMixin,
9+
from .mixins import (PluginBlueprint, PluginBlueprintMixin, PluginBlueprintSetupState, PluginBlueprintSetupStateMixin,
1010
PluginFlask, PluginFlaskMixin)
11-
from .plugin import Plugin, uses, depends, render_plugin_template, url_for_plugin
11+
from .plugin import Plugin, depends, render_plugin_template, url_for_plugin, uses
1212
from .signals import plugins_loaded
1313
from .templating import PluginPrefixLoader
14-
from .util import with_plugin_context, wrap_in_plugin_context, trim_docstring, plugin_context
14+
from .util import plugin_context, trim_docstring, with_plugin_context, wrap_in_plugin_context
15+
1516

1617
__version__ = '0.4.1'
1718
__all__ = ('PluginEngine', 'current_plugin', 'PluginBlueprintSetupState', 'PluginBlueprintSetupStateMixin',

flask_pluginengine/globals.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# Flask-PluginEngine is free software; you can redistribute it
55
# and/or modify it under the terms of the Revised BSD License.
66

7-
from werkzeug.local import LocalStack, LocalProxy
7+
from werkzeug.local import LocalProxy, LocalStack
8+
89

910
_plugin_ctx_stack = LocalStack()
1011

flask_pluginengine/mixins.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
from flask import Blueprint, Flask
88
from flask.blueprints import BlueprintSetupState
9-
from werkzeug.utils import cached_property
109
from jinja2 import ChoiceLoader
10+
from werkzeug.utils import cached_property
1111

1212
from .globals import current_plugin
13-
from .templating import PluginPrefixLoader, PluginEnvironment
13+
from .templating import PluginEnvironment, PluginPrefixLoader
1414
from .util import wrap_in_plugin_context
1515

1616

flask_pluginengine/plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
from contextlib import contextmanager
88

9-
from flask import render_template, url_for, current_app
9+
from flask import current_app, render_template, url_for
1010

1111
from .globals import _plugin_ctx_stack, current_plugin
12-
from .util import wrap_in_plugin_context, trim_docstring, classproperty, get_state
12+
from .util import classproperty, get_state, trim_docstring, wrap_in_plugin_context
1313

1414

1515
def depends(*plugins):

flask_pluginengine/signals.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from blinker import Namespace
88

9+
910
_signals = Namespace()
1011
plugins_loaded = _signals.signal('plugins-loaded', """
1112
Called after :meth:`~PluginEngine.load_plugins` has loaded the

flask_pluginengine/templating.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
from flask import current_app
1010
from flask.templating import Environment
11-
from jinja2 import FileSystemLoader, PrefixLoader, TemplateNotFound, Template
11+
from jinja2 import FileSystemLoader, PrefixLoader, Template, TemplateNotFound
1212
from jinja2.compiler import CodeGenerator
13-
from jinja2.runtime import Macro, Context
13+
from jinja2.runtime import Context, Macro
1414
from jinja2.utils import internalcode
1515

16-
from .util import (wrap_iterator_in_plugin_context, wrap_macro_in_plugin_context, get_state,
17-
plugin_name_from_template_name)
16+
from .util import (get_state, plugin_name_from_template_name, wrap_iterator_in_plugin_context,
17+
wrap_macro_in_plugin_context)
1818

1919

2020
class PrefixIgnoringFileSystemLoader(FileSystemLoader):

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ install_requires =
3434

3535
[options.extras_require]
3636
dev =
37+
isort
3738
pytest
3839
pytest-cov
3940

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66

77
from setuptools import setup
88

9+
910
setup()

tox.ini

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@ deps =
1212

1313
[testenv:style]
1414
skip_install = true
15-
deps = flake8
16-
commands = flake8 setup.py flask_pluginengine
15+
deps =
16+
flake8
17+
isort
18+
commands =
19+
flake8 setup.py flask_pluginengine
20+
isort --diff --check-only setup.py flask_pluginengine

0 commit comments

Comments
 (0)