Cleaning for flake8-import-order

Author: half-duplex

dev-requirements.txt

@@ -5,6 +5,8 @@ flake8<3.6.0; python_version == '3.3'
 flake8>=3.7.0,<3.8.0; python_version != '3.3'
 flake8-coding
 flake8-future-import<0.4.6
+flake8-import-order; python_version > '3.3'
+flake8-import-order<=1.18.1; python_version <= '3.3'
 setuptools<40.0; python_version == '3.3'
 sphinx
 sphinxcontrib-autoprogram

pytest_run.py

@@ -11,7 +11,7 @@
 
 https://sopel.chat
 """
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 if __name__ == "__main__":
     import sys

setup.cfg

@@ -40,6 +40,8 @@ pytest11 =
 
 [flake8]
 max-line-length = 79
+application-import-names = sopel
+import-order-style = google
 ignore =
     # Line length limit. Acceptable (for now).
     E501,

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding=utf-8
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import sys
 import time

sopel.py

@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 # coding=utf-8
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import sys
+
 # Different from setuptools script, because we want the one in this dir.
 from sopel.cli import run
+
 sys.exit(run.main())

sopel/__init__.py

@@ -10,14 +10,15 @@
 #
 # Licensed under the Eiffel Forum License 2.
 
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from collections import namedtuple
 import locale
-import pkg_resources
 import re
 import sys
 
+import pkg_resources
+
 __all__ = [
     'bot',
     'config',

sopel/bot.py

@@ -6,7 +6,7 @@
 #
 # Licensed under the Eiffel Forum License 2.
 
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ast import literal_eval
 import collections
@@ -20,11 +20,11 @@
 
 from sopel import irc, logger, plugins, tools
 from sopel.db import SopelDB
-from sopel.tools import Identifier, deprecated
+import sopel.loader
+from sopel.module import NOLIMIT
+from sopel.tools import deprecated, Identifier
 import sopel.tools.jobs
 from sopel.trigger import Trigger
-from sopel.module import NOLIMIT
-import sopel.loader
 
 
 __all__ = ['Sopel', 'SopelWrapper']

sopel/cli/__init__.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 # Shortcut imports
 from .utils import (  # noqa

sopel/cli/config.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 """Sopel Config Command Line Interface (CLI): ``sopel-config``"""
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import argparse
 import os

sopel/cli/plugins.py

@@ -1,13 +1,12 @@
 # coding=utf-8
 """Sopel Plugins Command Line Interface (CLI): ``sopel-plugins``"""
-from __future__ import unicode_literals, absolute_import, print_function, division
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import argparse
 import inspect
 import operator
 
 from sopel import plugins, tools
-
 from . import utils