From 707b0085cb1034e6a8e6faed6a78bc675b878fd4 Mon Sep 17 00:00:00 2001
From: Alex Stapleton <alexs@prol.etari.at>
Date: Sun, 20 Apr 2014 22:24:41 +0100
Subject: Fix pep8 errors for latest import linter

---
 setup.py                                 | 2 +-
 tests/hazmat/primitives/test_dsa.py      | 2 +-
 tests/utils.py                           | 2 +-
 tox.ini                                  | 2 +-
 vectors/cryptography_vectors/__init__.py | 4 ++--
 vectors/setup.py                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index d3a8a6d5..c841911f 100644
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,8 @@
 from __future__ import absolute_import, division, print_function
 
 import os
-import sys
 import subprocess
+import sys
 from distutils.command.build import build
 
 import pkg_resources
diff --git a/tests/hazmat/primitives/test_dsa.py b/tests/hazmat/primitives/test_dsa.py
index 2b5d4bb3..bc3b1db6 100644
--- a/tests/hazmat/primitives/test_dsa.py
+++ b/tests/hazmat/primitives/test_dsa.py
@@ -23,7 +23,7 @@ from cryptography.hazmat.primitives.asymmetric import dsa
 from cryptography.utils import bit_length
 
 from ...utils import (
-    load_vectors_from_file, load_fips_dsa_key_pair_vectors,
+    load_fips_dsa_key_pair_vectors, load_vectors_from_file,
     raises_unsupported_algorithm
 )
 
diff --git a/tests/utils.py b/tests/utils.py
index c38ba7ff..63560395 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -15,8 +15,8 @@ from __future__ import absolute_import, division, print_function
 
 import binascii
 import collections
-from contextlib import contextmanager
 import re
+from contextlib import contextmanager
 
 import pytest
 
diff --git a/tox.ini b/tox.ini
index c2dc7bc9..da959955 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,4 +57,4 @@ commands = flake8 .
 [flake8]
 exclude = .tox,*.egg
 select = E,W,F,N,I
-application-import-names = cryptography,tests
+application-import-names = cryptography,cryptography_vectors,tests
diff --git a/vectors/cryptography_vectors/__init__.py b/vectors/cryptography_vectors/__init__.py
index 02d748df..25df6b3a 100644
--- a/vectors/cryptography_vectors/__init__.py
+++ b/vectors/cryptography_vectors/__init__.py
@@ -16,8 +16,8 @@ from __future__ import absolute_import, division, print_function
 import os
 
 from cryptography_vectors.__about__ import (
-    __title__, __summary__, __uri__, __version__, __author__, __email__,
-    __license__, __copyright__
+    __author__, __copyright__, __email__, __license__, __summary__, __title__,
+    __uri__, __version__
 )
 
 
diff --git a/vectors/setup.py b/vectors/setup.py
index ce01e132..66841def 100644
--- a/vectors/setup.py
+++ b/vectors/setup.py
@@ -15,7 +15,7 @@ from __future__ import absolute_import, division, print_function
 
 import os
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 base_dir = os.path.dirname(__file__)
-- 
cgit v1.2.3