From 8d36355611e1e5a7c1a81bbbf8560c01d9ead979 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Thu, 25 Feb 2016 11:14:41 -0600
Subject: [PATCH] Re-order project imports based on flake8-import-order

---
 flake8/main/cli.py           | 2 +-
 flake8/options/aggregator.py | 2 +-
 flake8/plugins/manager.py    | 6 +++---
 flake8/plugins/pyflakes.py   | 5 +++--
 flake8/style_guide.py        | 3 +--
 setup.py                     | 6 ++++--
 tox.ini                      | 1 +
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/flake8/main/cli.py b/flake8/main/cli.py
index 72ca829..15eea8e 100644
--- a/flake8/main/cli.py
+++ b/flake8/main/cli.py
@@ -1,10 +1,10 @@
 """Command-line implementation of flake8."""
 import flake8
 from flake8 import defaults
+from flake8 import style_guide
 from flake8.options import aggregator
 from flake8.options import manager
 from flake8.plugins import manager as plugin_manager
-from flake8 import style_guide
 
 
 def register_default_options(option_manager):
diff --git a/flake8/options/aggregator.py b/flake8/options/aggregator.py
index b344cf0..99d0cfe 100644
--- a/flake8/options/aggregator.py
+++ b/flake8/options/aggregator.py
@@ -5,8 +5,8 @@ applies the user-specified command-line configuration on top of it.
 """
 import logging
 
-from flake8.options import config
 from flake8 import utils
+from flake8.options import config
 
 LOG = logging.getLogger(__name__)
 
diff --git a/flake8/plugins/manager.py b/flake8/plugins/manager.py
index 05e5e2b..aba5f16 100644
--- a/flake8/plugins/manager.py
+++ b/flake8/plugins/manager.py
@@ -2,11 +2,11 @@
 import collections
 import logging
 
-import pkg_resources
-
 from flake8 import exceptions
-from flake8.plugins import notifier
 from flake8 import utils
+from flake8.plugins import notifier
+
+import pkg_resources
 
 LOG = logging.getLogger(__name__)
 
diff --git a/flake8/plugins/pyflakes.py b/flake8/plugins/pyflakes.py
index f512511..7025baa 100644
--- a/flake8/plugins/pyflakes.py
+++ b/flake8/plugins/pyflakes.py
@@ -1,6 +1,7 @@
 """Plugin built-in to Flake8 to treat pyflakes as a plugin."""
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+
 try:
     # The 'demandimport' breaks pyflakes and flake8.plugins.pyflakes
     from mercurial import demandimport
@@ -10,11 +11,11 @@ else:
     demandimport.disable()
 import os
 
+from flake8 import utils
+
 import pyflakes
 import pyflakes.checker
 
-from flake8 import utils
-
 
 def patch_pyflakes():
     """Add error codes to Pyflakes messages."""
diff --git a/flake8/style_guide.py b/flake8/style_guide.py
index c3b3d5f..bbfe658 100644
--- a/flake8/style_guide.py
+++ b/flake8/style_guide.py
@@ -1,11 +1,10 @@
 """Implementation of the StyleGuide used by Flake8."""
 import collections
+import enum
 import linecache
 import logging
 import re
 
-import enum
-
 from flake8 import utils
 
 __all__ = (
diff --git a/setup.py b/setup.py
index 1f4a6a0..ec40eb6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,12 @@
 """Packaging logic for Flake8."""
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
-import setuptools
+
 import sys
 
-import flake8
+import setuptools
+
+import flake8  # noqa
 
 try:
     # Work around a traceback with Nose on Python 2.6
diff --git a/tox.ini b/tox.ini
index 9ea64cf..d5e07cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,7 @@ use_develop = false
 deps =
     flake8
     flake8-docstrings
+    flake8-import-order
 commands =
     flake8