harmonize isort & flake8 config (#1169)

setup.cfg

@@ -56,9 +56,8 @@ exclude =
 max-line-length = 119
 
 [isort]
-combine_as_imports = true
+force_single_line = true
 default_section = THIRDPARTY
 include_trailing_comma = true
 known_first_party = storages
-line_length = 79
-multi_line_output = 5
+line_length = 119

storages/backends/apache_libcloud.py

@@ -13,7 +13,8 @@
 
 try:
     from libcloud.storage.providers import get_driver
-    from libcloud.storage.types import ObjectDoesNotExistError, Provider
+    from libcloud.storage.types import ObjectDoesNotExistError
+    from libcloud.storage.types import Provider
 except ImportError:
     raise ImproperlyConfigured("Could not load libcloud")
 

storages/backends/azure_storage.py

@@ -1,21 +1,25 @@
 import mimetypes
-from datetime import datetime, timedelta
+from datetime import datetime
+from datetime import timedelta
 from tempfile import SpooledTemporaryFile
 
 from azure.core.exceptions import ResourceNotFoundError
-from azure.storage.blob import (
-    BlobClient, BlobSasPermissions, BlobServiceClient, ContentSettings,
-    generate_blob_sas,
-)
+from azure.storage.blob import BlobClient
+from azure.storage.blob import BlobSasPermissions
+from azure.storage.blob import BlobServiceClient
+from azure.storage.blob import ContentSettings
+from azure.storage.blob import generate_blob_sas
 from django.core.exceptions import SuspiciousOperation
 from django.core.files.base import File
 from django.utils import timezone
 from django.utils.deconstruct import deconstructible
 
 from storages.base import BaseStorage
-from storages.utils import (
-    clean_name, get_available_overwrite_name, safe_join, setting, to_bytes,
-)
+from storages.utils import clean_name
+from storages.utils import get_available_overwrite_name
+from storages.utils import safe_join
+from storages.utils import setting
+from storages.utils import to_bytes
 
 
 @deconstructible

storages/backends/dropbox.py

@@ -23,11 +23,13 @@
 from django.utils.deconstruct import deconstructible
 from dropbox import Dropbox
 from dropbox.exceptions import ApiError
-from dropbox.files import (
-    CommitInfo, FolderMetadata, UploadSessionCursor, WriteMode,
-)
+from dropbox.files import CommitInfo
+from dropbox.files import FolderMetadata
+from dropbox.files import UploadSessionCursor
+from dropbox.files import WriteMode
 
-from storages.utils import get_available_overwrite_name, setting
+from storages.utils import get_available_overwrite_name
+from storages.utils import setting
 
 _DEFAULT_TIMEOUT = 100
 _DEFAULT_MODE = 'add'

storages/backends/ftp.py

@@ -18,7 +18,8 @@
 import io
 import os
 from datetime import datetime
-from urllib.parse import urljoin, urlparse
+from urllib.parse import urljoin
+from urllib.parse import urlparse
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

storages/backends/gcloud.py

@@ -3,21 +3,26 @@
 from datetime import timedelta
 from tempfile import SpooledTemporaryFile
 
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import SuspiciousOperation
 from django.core.files.base import File
 from django.utils import timezone
 from django.utils.deconstruct import deconstructible
 
 from storages.base import BaseStorage
-from storages.compress import CompressedFileMixin, CompressStorageMixin
-from storages.utils import (
-    check_location, clean_name, get_available_overwrite_name, safe_join,
-    setting, to_bytes,
-)
+from storages.compress import CompressedFileMixin
+from storages.compress import CompressStorageMixin
+from storages.utils import check_location
+from storages.utils import clean_name
+from storages.utils import get_available_overwrite_name
+from storages.utils import safe_join
+from storages.utils import setting
+from storages.utils import to_bytes
 
 try:
     from google.cloud.exceptions import NotFound
-    from google.cloud.storage import Blob, Client
+    from google.cloud.storage import Blob
+    from google.cloud.storage import Client
     from google.cloud.storage.blob import _quote
 except ImportError:
     raise ImproperlyConfigured("Could not load Google Cloud Storage bindings.\n"

storages/backends/s3boto3.py

@@ -3,23 +3,31 @@
 import posixpath
 import tempfile
 import threading
-from datetime import datetime, timedelta
+from datetime import datetime
+from datetime import timedelta
 from tempfile import SpooledTemporaryFile
-from urllib.parse import parse_qsl, urlencode, urlsplit
+from urllib.parse import parse_qsl
+from urllib.parse import urlencode
+from urllib.parse import urlsplit
 
 from django.contrib.staticfiles.storage import ManifestFilesMixin
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import SuspiciousOperation
 from django.core.files.base import File
 from django.utils.deconstruct import deconstructible
 from django.utils.encoding import filepath_to_uri
-from django.utils.timezone import is_naive, make_naive
+from django.utils.timezone import is_naive
+from django.utils.timezone import make_naive
 
 from storages.base import BaseStorage
-from storages.compress import CompressedFileMixin, CompressStorageMixin
-from storages.utils import (
-    check_location, get_available_overwrite_name, lookup_env, safe_join,
-    setting, to_bytes,
-)
+from storages.compress import CompressedFileMixin
+from storages.compress import CompressStorageMixin
+from storages.utils import check_location
+from storages.utils import get_available_overwrite_name
+from storages.utils import lookup_env
+from storages.utils import safe_join
+from storages.utils import setting
+from storages.utils import to_bytes
 
 try:
     import boto3.session
@@ -37,9 +45,7 @@ def _use_cryptography_signer():
     from cryptography.hazmat.backends import default_backend
     from cryptography.hazmat.primitives import hashes
     from cryptography.hazmat.primitives.asymmetric import padding
-    from cryptography.hazmat.primitives.serialization import (
-        load_pem_private_key,
-    )
+    from cryptography.hazmat.primitives.serialization import load_pem_private_key
 
     def _cloud_front_signer_from_pem(key_id, pem):
         if isinstance(pem, str):

storages/utils.py

@@ -2,9 +2,8 @@
 import posixpath
 
 from django.conf import settings
-from django.core.exceptions import (
-    ImproperlyConfigured, SuspiciousFileOperation,
-)
+from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import SuspiciousFileOperation
 from django.utils.encoding import force_bytes
 
 

tests/test_azure.py

@@ -7,7 +7,8 @@
 from azure.storage.blob import BlobProperties
 from django.core.exceptions import SuspiciousOperation
 from django.core.files.base import ContentFile
-from django.test import TestCase, override_settings
+from django.test import TestCase
+from django.test import override_settings
 from django.utils import timezone
 from django.utils.timezone import make_aware
 

tests/test_dropbox.py

@@ -2,12 +2,13 @@
 from datetime import datetime
 from unittest import mock
 
-from django.core.exceptions import (
-    ImproperlyConfigured, SuspiciousFileOperation,
-)
+from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import SuspiciousFileOperation
 from django.core.files.base import File
 from django.test import TestCase
-from dropbox.files import FileMetadata, FolderMetadata, GetTemporaryLinkResult
+from dropbox.files import FileMetadata
+from dropbox.files import FolderMetadata
+from dropbox.files import GetTemporaryLinkResult
 from requests.models import Response
 
 from storages.backends import dropbox

tests/test_gcloud.py

@@ -1,11 +1,13 @@
 import gzip
 import mimetypes
-from datetime import datetime, timedelta
+from datetime import datetime
+from datetime import timedelta
 from unittest import mock
 
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files.base import ContentFile
-from django.test import TestCase, override_settings
+from django.test import TestCase
+from django.test import override_settings
 from django.utils import timezone
 from google.cloud.exceptions import NotFound
 from google.cloud.storage.blob import Blob

tests/test_s3boto3.py

@@ -3,15 +3,18 @@
 import threading
 from datetime import datetime
 from textwrap import dedent
-from unittest import mock, skipIf
+from unittest import mock
+from unittest import skipIf
 from urllib.parse import urlparse
 
 from botocore.exceptions import ClientError
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files.base import ContentFile
-from django.test import TestCase, override_settings
-from django.utils.timezone import is_aware, utc
+from django.test import TestCase
+from django.test import override_settings
+from django.utils.timezone import is_aware
+from django.utils.timezone import utc
 
 from storages.backends import s3boto3
 from tests.utils import NonSeekableContentFile

tests/test_sftp.py

@@ -3,11 +3,13 @@
 import socket
 import stat
 from datetime import datetime
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 import paramiko
 from django.core.files.base import File
-from django.test import TestCase, override_settings
+from django.test import TestCase
+from django.test import override_settings
 
 from storages.backends import sftpstorage