Merge lp:~ajkavanagh/charm-helpers/remove-e402-ignore into lp:charm-helpers

[Alex Kavanagh]

Remove E402 ingore for pep8 to improve code checking

The flake8 pep8 tests used an --ignore E402 which is about
not having all the imports before 'code'. This is a known
code QA issue, and so this patch removes the ignore. One
test module needed to be patched with a #noqa, but that's
because the files imported adjusted their behaviour based
on the changed line for the tests

[Stuart Bishop (stub)]

I guess we have less import magic now, which is a win.

review: Approve

=== modified file 'Makefile'
--- Makefile	2017-06-15 22:15:44 +0000
+++ Makefile	2017-07-20 15:59:20 +0000
@@ -69,9 +69,9 @@
 
 lint: .venv .venv3
 	@echo Checking for Python syntax...
-	@.venv/bin/flake8 --ignore=E501,E402 $(PROJECT) $(TESTS) tools/ \
+	@.venv/bin/flake8 --ignore=E501 $(PROJECT) $(TESTS) tools/ \
 	    && echo Py2 OK
-	@.venv3/bin/flake8 --ignore=E501,E402 $(PROJECT) $(TESTS) tools/ \
+	@.venv3/bin/flake8 --ignore=E501 $(PROJECT) $(TESTS) tools/ \
 	    && echo Py3 OK
 
 docs:
 
=== modified file 'tests/contrib/hardening/test_templating.py'
--- tests/contrib/hardening/test_templating.py	2017-03-20 10:28:01 +0000
+++ tests/contrib/hardening/test_templating.py	2017-07-20 15:59:20 +0000
@@ -19,7 +19,7 @@
 from mock import call, patch
 from unittest import TestCase
 
-os.environ['JUJU_CHARM_DIR'] = '/tmp'
+os.environ['JUJU_CHARM_DIR'] = '/tmp'  # noqa: E402
 
 from charmhelpers.contrib.hardening import templating
 from charmhelpers.contrib.hardening import utils