From 8f3e7d8b69a145304c212925b260659b5a706304 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Mon, 10 Aug 2015 07:35:26 -0400
Subject: Fix the pep8 settings.

---
 Makefile | 2 +-
 tox.ini  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 67fd6f0..233be41 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ spell:
 	-pylint --disable=all --enable=spelling $(LINTABLE)
 
 pep8:
-	pep8 --filename=*.py --ignore=E401,E301 --repeat $(LINTABLE)
+	pep8 --filename=*.py --repeat $(LINTABLE)
 
 test:
 	tox -e py27 $(ARGS)
diff --git a/tox.ini b/tox.ini
index 7e55bc4..355ca7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,6 +49,8 @@ basepython = pypy3-2.4
 # Yes, pep8 will read its settings from tox.ini!
 [pep8]
 # E265: block comment should start with '# '
+# E301 expected 1 blank line, found 0
+# E401 multiple imports on one line
 # The rest are the default ignored warnings.
-ignore = E265,E123,E133,E226,E241,E242
+ignore = E265,E123,E133,E226,E241,E242,E301,E401
 max-line-length = 100
-- 
cgit v1.2.1