From 0bd7df5e9b6c273b9d50202419aa5933c9c51bea Mon Sep 17 00:00:00 2001
From: Craig Tracey <craigtracey@gmail.com>
Date: Thu, 12 Feb 2015 16:18:57 -0500
Subject: [PATCH] Fix pep8 failures

pep8 with 1.6.x is now failing as it wants all imports at the
beginning of the file. Unfortunately, this does not work for us in
all circumstances. Therefore, ignore E402 and fix the E402's where
it actually makes sense.
---
 giftwrap/builders/docker_builder.py  | 3 +--
 giftwrap/builders/package_builder.py | 4 +---
 tox.ini                              | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/giftwrap/builders/docker_builder.py b/giftwrap/builders/docker_builder.py
index cd0e428..bdd5ef9 100644
--- a/giftwrap/builders/docker_builder.py
+++ b/giftwrap/builders/docker_builder.py
@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations
 
 import docker
+import jinja2
 import json
 import logging
 import os
@@ -25,8 +26,6 @@ from giftwrap.builder import Builder
 
 LOG = logging.getLogger(__name__)
 
-import jinja2
-
 DEFAULT_TEMPLATE_FILE = os.path.join(os.path.dirname(
                                      os.path.dirname(__file__)),
                                      'templates/Dockerfile.jinja2')
diff --git a/giftwrap/builders/package_builder.py b/giftwrap/builders/package_builder.py
index 70e1fdb..f756090 100644
--- a/giftwrap/builders/package_builder.py
+++ b/giftwrap/builders/package_builder.py
@@ -19,6 +19,7 @@ import os
 import shutil
 import tempfile
 
+from giftwrap.builder import Builder
 from giftwrap.gerrit import GerritReview
 from giftwrap.openstack_git_repo import OpenstackGitRepo
 from giftwrap.package import Package
@@ -27,9 +28,6 @@ from giftwrap.util import execute
 LOG = logging.getLogger(__name__)
 
 
-from giftwrap.builder import Builder
-
-
 class PackageBuilder(Builder):
 
     def __init__(self, spec):
diff --git a/tox.ini b/tox.ini
index 43967ca..216bd0a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ downloadcache = {toxworkdir}/_download
 
 [testenv:pep8]
 commands =
-    flake8 {posargs} {toxinidir}/giftwrap
+    flake8 {posargs} --ignore=E402 {toxinidir}/giftwrap
 
 [testenv:venv]
 commands = {posargs}