flake8-import-order (#1099)

* flake8-import-order

* make sure bad import orders fail

* flake8-import-order

* add application name to flake8 section

* correct import order for openssl as application

Author: whiteowl3

setup.py

@@ -12,7 +12,7 @@
 import os
 import re
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 HERE = os.path.abspath(os.path.dirname(__file__))

src/OpenSSL/SSL.py

@@ -1,29 +1,28 @@
 import os
 import socket
+from errno import errorcode
+from functools import partial, wraps
+from itertools import chain, count
 from sys import platform
-from functools import wraps, partial
-from itertools import count, chain
 from weakref import WeakValueDictionary
-from errno import errorcode
 
 from OpenSSL._util import (
     UNSPECIFIED as _UNSPECIFIED,
     exception_from_error_queue as _exception_from_error_queue,
     ffi as _ffi,
     lib as _lib,
     make_assert as _make_assert,
+    no_zero_allocator as _no_zero_allocator,
     path_bytes as _path_bytes,
     text_to_bytes_and_warn as _text_to_bytes_and_warn,
-    no_zero_allocator as _no_zero_allocator,
 )
-
 from OpenSSL.crypto import (
     FILETYPE_PEM,
-    _PassphraseHelper,
     PKey,
-    X509Name,
     X509,
+    X509Name,
     X509Store,
+    _PassphraseHelper,
 )
 
 __all__ = [

src/OpenSSL/__init__.py

@@ -5,7 +5,7 @@
 pyOpenSSL - A simple wrapper around the OpenSSL library
 """
 
-from OpenSSL import crypto, SSL
+from OpenSSL import SSL, crypto
 from OpenSSL.version import (
     __author__,
     __copyright__,

src/OpenSSL/crypto.py

@@ -1,7 +1,7 @@
 import calendar
 import datetime
-from base64 import b16encode
 import functools
+from base64 import b16encode
 from functools import partial
 
 from cryptography import utils, x509
@@ -14,16 +14,17 @@
 )
 
 from OpenSSL._util import (
+    UNSPECIFIED as _UNSPECIFIED,
+    byte_string as _byte_string,
+    exception_from_error_queue as _exception_from_error_queue,
     ffi as _ffi,
     lib as _lib,
-    exception_from_error_queue as _exception_from_error_queue,
-    byte_string as _byte_string,
+    make_assert as _make_assert,
     path_bytes as _path_bytes,
-    UNSPECIFIED as _UNSPECIFIED,
     text_to_bytes_and_warn as _text_to_bytes_and_warn,
-    make_assert as _make_assert,
 )
 
+
 __all__ = [
     "FILETYPE_PEM",
     "FILETYPE_ASN1",

src/OpenSSL/debug.py

@@ -3,10 +3,12 @@
 import ssl
 import sys
 
-import OpenSSL.SSL
 import cffi
+
 import cryptography
 
+import OpenSSL.SSL
+
 from . import version
 
 

tests/memdbg.py

@@ -1,5 +1,4 @@
 import sys
-
 import traceback
 
 from cffi import api as _api

tests/test_crypto.py

@@ -4,55 +4,65 @@
 """
 Unit tests for :py:mod:`OpenSSL.crypto`.
 """
-
-from warnings import simplefilter
-
 import base64
-from subprocess import PIPE, Popen
-from datetime import datetime, timedelta
 import sys
-
-import pytest
+from datetime import datetime, timedelta
+from subprocess import PIPE, Popen
+from warnings import simplefilter
 
 from cryptography import x509
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import ec, ed25519, ed448, rsa
 
 import flaky
 
-from OpenSSL.crypto import TYPE_RSA, TYPE_DSA, Error, PKey
-from OpenSSL.crypto import X509, X509Name
+import pytest
+
+from OpenSSL._util import ffi as _ffi, lib as _lib
 from OpenSSL.crypto import (
+    CRL,
+    Error,
+    FILETYPE_ASN1,
+    FILETYPE_PEM,
+    FILETYPE_TEXT,
+    NetscapeSPKI,
+    PKCS12,
+    PKCS7,
+    PKey,
+    Revoked,
+    TYPE_DSA,
+    TYPE_RSA,
+    X509,
+    X509Extension,
+    X509Name,
+    X509Req,
     X509Store,
-    X509StoreFlags,
     X509StoreContext,
     X509StoreContextError,
-)
-from OpenSSL.crypto import X509Req
-from OpenSSL.crypto import X509Extension
-from OpenSSL.crypto import load_certificate, load_privatekey
-from OpenSSL.crypto import load_publickey, dump_publickey
-from OpenSSL.crypto import FILETYPE_PEM, FILETYPE_ASN1, FILETYPE_TEXT
-from OpenSSL.crypto import dump_certificate, load_certificate_request
-from OpenSSL.crypto import dump_certificate_request, dump_privatekey
-from OpenSSL.crypto import PKCS7, load_pkcs7_data
-from OpenSSL.crypto import PKCS12, load_pkcs12
-from OpenSSL.crypto import CRL, Revoked, dump_crl, load_crl
-from OpenSSL.crypto import NetscapeSPKI
-from OpenSSL.crypto import (
-    sign,
-    verify,
+    X509StoreFlags,
+    dump_certificate,
+    dump_certificate_request,
+    dump_crl,
+    dump_privatekey,
+    dump_publickey,
     get_elliptic_curve,
     get_elliptic_curves,
+    load_certificate,
+    load_certificate_request,
+    load_crl,
+    load_pkcs12,
+    load_pkcs7_data,
+    load_privatekey,
+    load_publickey,
+    sign,
+    verify,
 )
 
-from OpenSSL._util import ffi as _ffi, lib as _lib
-
 from .util import (
     EqualityTestsMixin,
-    is_consistent_type,
-    WARNING_TYPE_EXPECTED,
     NON_ASCII,
+    WARNING_TYPE_EXPECTED,
+    is_consistent_type,
 )
 
 

tests/test_debug.py

@@ -1,5 +1,5 @@
-from OpenSSL.debug import _env_info
 from OpenSSL import version
+from OpenSSL.debug import _env_info
 
 
 def test_debug_info():