From 6c7c8d9a604ee4b4018b5448a78ccc64474a410a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= Date: Tue, 7 Jan 2020 15:18:54 +0100 Subject: [PATCH] Add isort support. --- Makefile | 6 ++++- demo/demoproject/apache/tests.py | 4 +-- demo/demoproject/apache/urls.py | 3 +-- demo/demoproject/apache/views.py | 1 - demo/demoproject/compat.py | 2 +- demo/demoproject/http/tests.py | 3 +-- demo/demoproject/http/urls.py | 1 - demo/demoproject/lighttpd/tests.py | 2 +- demo/demoproject/lighttpd/urls.py | 1 - demo/demoproject/lighttpd/views.py | 1 - demo/demoproject/nginx/tests.py | 2 +- demo/demoproject/nginx/urls.py | 1 - demo/demoproject/nginx/views.py | 1 - demo/demoproject/object/tests.py | 6 ++--- demo/demoproject/object/urls.py | 1 - demo/demoproject/object/views.py | 4 +-- demo/demoproject/path/tests.py | 3 +-- demo/demoproject/path/urls.py | 1 - demo/demoproject/path/views.py | 1 - demo/demoproject/settings.py | 4 +-- demo/demoproject/storage/storage.py | 1 - demo/demoproject/storage/tests.py | 11 ++++---- demo/demoproject/storage/urls.py | 1 - demo/demoproject/storage/views.py | 1 - demo/demoproject/tests.py | 4 +-- demo/demoproject/urls.py | 3 +-- demo/demoproject/virtual/tests.py | 3 +-- demo/demoproject/virtual/urls.py | 1 - demo/demoproject/virtual/views.py | 7 ++--- demo/demoproject/wsgi.py | 1 - demo/setup.py | 3 --- django_downloadview/__init__.py | 5 +--- django_downloadview/apache/__init__.py | 2 +- django_downloadview/apache/decorators.py | 2 +- django_downloadview/apache/middlewares.py | 2 +- django_downloadview/api.py | 30 +++++++++------------ django_downloadview/files.py | 5 ++-- django_downloadview/io.py | 4 +-- django_downloadview/lighttpd/__init__.py | 2 +- django_downloadview/lighttpd/middlewares.py | 2 +- django_downloadview/middlewares.py | 9 +++---- django_downloadview/nginx/__init__.py | 2 +- django_downloadview/nginx/middlewares.py | 2 +- django_downloadview/nginx/settings.py | 1 - django_downloadview/response.py | 2 +- django_downloadview/utils.py | 1 - django_downloadview/views/__init__.py | 6 ++--- django_downloadview/views/base.py | 2 +- tests/api.py | 4 +-- tests/io.py | 3 +-- tests/packaging.py | 1 - tests/sendfile.py | 2 +- tests/views.py | 11 +++----- 53 files changed, 69 insertions(+), 115 deletions(-) diff --git a/Makefile b/Makefile index 1d53049..4256491 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PIP = pip TOX = tox BLACK = black - +ISORT = isort #: help - Display callable targets. .PHONY: help @@ -101,3 +101,7 @@ release: .PHONY: black black: $(BLACK) demo tests django_downloadview + +.PHONY: isort +isort: + $(ISORT) -m 3 --line-width=99 --use-parentheses --trailing-comma --recursive django_downloadview tests demo diff --git a/demo/demoproject/apache/tests.py b/demo/demoproject/apache/tests.py index 2635f1a..8c0aef5 100644 --- a/demo/demoproject/apache/tests.py +++ b/demo/demoproject/apache/tests.py @@ -1,12 +1,12 @@ import os -from django.core.files.base import ContentFile import django.test +from django.core.files.base import ContentFile from django_downloadview.apache import assert_x_sendfile -from demoproject.compat import reverse from demoproject.apache.views import storage, storage_dir +from demoproject.compat import reverse def setup_file(): diff --git a/demo/demoproject/apache/urls.py b/demo/demoproject/apache/urls.py index 2c7b1c8..9ef207e 100644 --- a/demo/demoproject/apache/urls.py +++ b/demo/demoproject/apache/urls.py @@ -1,9 +1,8 @@ """URL mapping.""" from django.conf.urls import url -from demoproject.compat import patterns from demoproject.apache import views - +from demoproject.compat import patterns urlpatterns = patterns( "demoproject.apache.views", diff --git a/demo/demoproject/apache/views.py b/demo/demoproject/apache/views.py index e5c0f20..a248e5e 100644 --- a/demo/demoproject/apache/views.py +++ b/demo/demoproject/apache/views.py @@ -6,7 +6,6 @@ from django.core.files.storage import FileSystemStorage from django_downloadview import StorageDownloadView from django_downloadview.apache import x_sendfile - storage_dir = os.path.join(settings.MEDIA_ROOT, "apache") storage = FileSystemStorage( location=storage_dir, base_url="".join([settings.MEDIA_URL, "apache/"]) diff --git a/demo/demoproject/compat.py b/demo/demoproject/compat.py index a95f5d1..d0e1c99 100644 --- a/demo/demoproject/compat.py +++ b/demo/demoproject/compat.py @@ -1,6 +1,6 @@ from distutils.version import StrictVersion -from django.utils.version import get_version +from django.utils.version import get_version try: from django.conf.urls import patterns # noqa diff --git a/demo/demoproject/http/tests.py b/demo/demoproject/http/tests.py index dcb0f4e..8feab26 100644 --- a/demo/demoproject/http/tests.py +++ b/demo/demoproject/http/tests.py @@ -1,8 +1,7 @@ import django.test -from django_downloadview import assert_download_response - from demoproject.compat import reverse +from django_downloadview import assert_download_response class SimpleURLTestCase(django.test.TestCase): diff --git a/demo/demoproject/http/urls.py b/demo/demoproject/http/urls.py index 7e7fe87..1994709 100644 --- a/demo/demoproject/http/urls.py +++ b/demo/demoproject/http/urls.py @@ -3,7 +3,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.http import views - urlpatterns = patterns( "", url(r"^simple_url/$", views.simple_url, name="simple_url"), diff --git a/demo/demoproject/lighttpd/tests.py b/demo/demoproject/lighttpd/tests.py index 45b3f7c..c238856 100644 --- a/demo/demoproject/lighttpd/tests.py +++ b/demo/demoproject/lighttpd/tests.py @@ -1,7 +1,7 @@ import os -from django.core.files.base import ContentFile import django.test +from django.core.files.base import ContentFile from django_downloadview.lighttpd import assert_x_sendfile diff --git a/demo/demoproject/lighttpd/urls.py b/demo/demoproject/lighttpd/urls.py index 72c6725..9f1a608 100644 --- a/demo/demoproject/lighttpd/urls.py +++ b/demo/demoproject/lighttpd/urls.py @@ -4,7 +4,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.lighttpd import views - urlpatterns = patterns( "demoproject.lighttpd.views", url( diff --git a/demo/demoproject/lighttpd/views.py b/demo/demoproject/lighttpd/views.py index 61363e8..e57b56e 100644 --- a/demo/demoproject/lighttpd/views.py +++ b/demo/demoproject/lighttpd/views.py @@ -6,7 +6,6 @@ from django.core.files.storage import FileSystemStorage from django_downloadview import StorageDownloadView from django_downloadview.lighttpd import x_sendfile - storage_dir = os.path.join(settings.MEDIA_ROOT, "lighttpd") storage = FileSystemStorage( location=storage_dir, base_url="".join([settings.MEDIA_URL, "lighttpd/"]) diff --git a/demo/demoproject/nginx/tests.py b/demo/demoproject/nginx/tests.py index 582adb7..1e41cac 100644 --- a/demo/demoproject/nginx/tests.py +++ b/demo/demoproject/nginx/tests.py @@ -1,7 +1,7 @@ import os -from django.core.files.base import ContentFile import django.test +from django.core.files.base import ContentFile from django_downloadview.nginx import assert_x_accel_redirect diff --git a/demo/demoproject/nginx/urls.py b/demo/demoproject/nginx/urls.py index 4f50bab..8583f6a 100644 --- a/demo/demoproject/nginx/urls.py +++ b/demo/demoproject/nginx/urls.py @@ -5,7 +5,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.nginx import views - urlpatterns = patterns( "demoproject.nginx.views", url( diff --git a/demo/demoproject/nginx/views.py b/demo/demoproject/nginx/views.py index 73ff734..e8546cc 100644 --- a/demo/demoproject/nginx/views.py +++ b/demo/demoproject/nginx/views.py @@ -6,7 +6,6 @@ from django.core.files.storage import FileSystemStorage from django_downloadview import StorageDownloadView from django_downloadview.nginx import x_accel_redirect - storage_dir = os.path.join(settings.MEDIA_ROOT, "nginx") storage = FileSystemStorage( location=storage_dir, base_url="".join([settings.MEDIA_URL, "nginx/"]) diff --git a/demo/demoproject/object/tests.py b/demo/demoproject/object/tests.py index 8e32b1a..b964c92 100644 --- a/demo/demoproject/object/tests.py +++ b/demo/demoproject/object/tests.py @@ -1,11 +1,9 @@ -from django.core.files.base import ContentFile import django.test - -from django_downloadview import temporary_media_root, assert_download_response +from django.core.files.base import ContentFile from demoproject.compat import reverse from demoproject.object.models import Document - +from django_downloadview import assert_download_response, temporary_media_root # Fixtures. slug = "hello-world" diff --git a/demo/demoproject/object/urls.py b/demo/demoproject/object/urls.py index f99b274..6e9b83f 100644 --- a/demo/demoproject/object/urls.py +++ b/demo/demoproject/object/urls.py @@ -3,7 +3,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.object import views - urlpatterns = patterns( "", url( diff --git a/demo/demoproject/object/views.py b/demo/demoproject/object/views.py index ed8020e..5488122 100644 --- a/demo/demoproject/object/views.py +++ b/demo/demoproject/object/views.py @@ -1,7 +1,5 @@ -from django_downloadview import ObjectDownloadView - from demoproject.object.models import Document - +from django_downloadview import ObjectDownloadView #: Serve ``file`` attribute of ``Document`` model. default_file_view = ObjectDownloadView.as_view(model=Document) diff --git a/demo/demoproject/path/tests.py b/demo/demoproject/path/tests.py index cf51231..039828d 100644 --- a/demo/demoproject/path/tests.py +++ b/demo/demoproject/path/tests.py @@ -1,8 +1,7 @@ import django.test -from django_downloadview import assert_download_response - from demoproject.compat import reverse +from django_downloadview import assert_download_response class StaticPathTestCase(django.test.TestCase): diff --git a/demo/demoproject/path/urls.py b/demo/demoproject/path/urls.py index a1812e2..63c1c43 100644 --- a/demo/demoproject/path/urls.py +++ b/demo/demoproject/path/urls.py @@ -3,7 +3,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.path import views - urlpatterns = patterns( "", url(r"^static-path/$", views.static_path, name="static_path"), diff --git a/demo/demoproject/path/views.py b/demo/demoproject/path/views.py index c17975d..2af02e3 100644 --- a/demo/demoproject/path/views.py +++ b/demo/demoproject/path/views.py @@ -2,7 +2,6 @@ import os from django_downloadview import PathDownloadView - # Let's initialize some fixtures. app_dir = os.path.dirname(os.path.abspath(__file__)) project_dir = os.path.dirname(app_dir) diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py index 18d1a5f..97f0501 100755 --- a/demo/demoproject/settings.py +++ b/demo/demoproject/settings.py @@ -1,8 +1,6 @@ -# -*- coding: utf-8 -*- """Django settings for django-downloadview demo project.""" - -from distutils.version import StrictVersion import os +from distutils.version import StrictVersion from django.utils.version import get_version diff --git a/demo/demoproject/storage/storage.py b/demo/demoproject/storage/storage.py index f685df2..cbbf48c 100644 --- a/demo/demoproject/storage/storage.py +++ b/demo/demoproject/storage/storage.py @@ -1,4 +1,3 @@ from django.core.files.storage import FileSystemStorage - storage = FileSystemStorage() diff --git a/demo/demoproject/storage/tests.py b/demo/demoproject/storage/tests.py index 46d8bb0..998e04f 100644 --- a/demo/demoproject/storage/tests.py +++ b/demo/demoproject/storage/tests.py @@ -1,16 +1,17 @@ import datetime import unittest +import django.test from django.core.files.base import ContentFile from django.http.response import HttpResponseNotModified -import django.test - -from django_downloadview import assert_download_response, temporary_media_root -from django_downloadview import setup_view from demoproject.compat import reverse from demoproject.storage import views - +from django_downloadview import ( + assert_download_response, + setup_view, + temporary_media_root, +) # Fixtures. file_content = "Hello world!\n" diff --git a/demo/demoproject/storage/urls.py b/demo/demoproject/storage/urls.py index ff16051..6b5dc17 100644 --- a/demo/demoproject/storage/urls.py +++ b/demo/demoproject/storage/urls.py @@ -3,7 +3,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.storage import views - urlpatterns = patterns( "", url( diff --git a/demo/demoproject/storage/views.py b/demo/demoproject/storage/views.py index e349f16..91db3f5 100644 --- a/demo/demoproject/storage/views.py +++ b/demo/demoproject/storage/views.py @@ -2,7 +2,6 @@ from django.core.files.storage import FileSystemStorage from django_downloadview import StorageDownloadView - storage = FileSystemStorage() diff --git a/demo/demoproject/tests.py b/demo/demoproject/tests.py index b82b8f6..f6bbfe3 100644 --- a/demo/demoproject/tests.py +++ b/demo/demoproject/tests.py @@ -1,9 +1,9 @@ # coding=utf8 """Test suite for demoproject.download.""" -from demoproject.compat import reverse - from django.test import TestCase +from demoproject.compat import reverse + class HomeViewTestCase(TestCase): """Test homepage.""" diff --git a/demo/demoproject/urls.py b/demo/demoproject/urls.py index 9df4bfb..caf80f6 100755 --- a/demo/demoproject/urls.py +++ b/demo/demoproject/urls.py @@ -1,8 +1,7 @@ from django.conf.urls import url from django.views.generic import TemplateView -from demoproject.compat import patterns, include - +from demoproject.compat import include, patterns home = TemplateView.as_view(template_name="home.html") diff --git a/demo/demoproject/virtual/tests.py b/demo/demoproject/virtual/tests.py index fb3b164..4a877cc 100644 --- a/demo/demoproject/virtual/tests.py +++ b/demo/demoproject/virtual/tests.py @@ -1,8 +1,7 @@ import django.test -from django_downloadview import assert_download_response - from demoproject.compat import reverse +from django_downloadview import assert_download_response class TextTestCase(django.test.TestCase): diff --git a/demo/demoproject/virtual/urls.py b/demo/demoproject/virtual/urls.py index 559695c..e1226dd 100644 --- a/demo/demoproject/virtual/urls.py +++ b/demo/demoproject/virtual/urls.py @@ -3,7 +3,6 @@ from django.conf.urls import url from demoproject.compat import patterns from demoproject.virtual import views - urlpatterns = patterns( "", url(r"^text/$", views.TextDownloadView.as_view(), name="text"), diff --git a/demo/demoproject/virtual/views.py b/demo/demoproject/virtual/views.py index 0091c66..f10940c 100644 --- a/demo/demoproject/virtual/views.py +++ b/demo/demoproject/virtual/views.py @@ -1,10 +1,7 @@ -from io import StringIO - from django.core.files.base import ContentFile -from django_downloadview import VirtualDownloadView -from django_downloadview import VirtualFile -from django_downloadview import TextIteratorIO +from django_downloadview import TextIteratorIO, VirtualDownloadView, VirtualFile +from io import StringIO class TextDownloadView(VirtualDownloadView): diff --git a/demo/demoproject/wsgi.py b/demo/demoproject/wsgi.py index 6135784..9beca42 100755 --- a/demo/demoproject/wsgi.py +++ b/demo/demoproject/wsgi.py @@ -16,7 +16,6 @@ import os from django.core.wsgi import get_wsgi_application - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "%s.settings" % __package__) # This application object is used by any WSGI server configured to use this diff --git a/demo/setup.py b/demo/setup.py index dd4d858..a684433 100644 --- a/demo/setup.py +++ b/demo/setup.py @@ -1,10 +1,7 @@ -# -*- coding: utf-8 -*- """Python packaging.""" import os - from setuptools import setup - here = os.path.abspath(os.path.dirname(__file__)) project_root = os.path.dirname(here) diff --git a/django_downloadview/__init__.py b/django_downloadview/__init__.py index b5814d9..239b866 100644 --- a/django_downloadview/__init__.py +++ b/django_downloadview/__init__.py @@ -1,10 +1,7 @@ """Serve files with Django and reverse proxies.""" import pkg_resources +from django_downloadview.api import * # NoQA #: Module version, as defined in PEP-0396. __version__ = pkg_resources.get_distribution(__package__.replace("-", "_")).version - - -# API shortcuts. -from django_downloadview.api import * # NoQA diff --git a/django_downloadview/apache/__init__.py b/django_downloadview/apache/__init__.py index b68d63d..478dd35 100644 --- a/django_downloadview/apache/__init__.py +++ b/django_downloadview/apache/__init__.py @@ -7,6 +7,6 @@ Apache optimizations `. """ # API shortcuts. from django_downloadview.apache.decorators import x_sendfile # NoQA +from django_downloadview.apache.middlewares import XSendfileMiddleware # NoQA from django_downloadview.apache.response import XSendfileResponse # NoQA from django_downloadview.apache.tests import assert_x_sendfile # NoQA -from django_downloadview.apache.middlewares import XSendfileMiddleware # NoQA diff --git a/django_downloadview/apache/decorators.py b/django_downloadview/apache/decorators.py index 26f1523..dda7890 100644 --- a/django_downloadview/apache/decorators.py +++ b/django_downloadview/apache/decorators.py @@ -1,6 +1,6 @@ """Decorators to apply Apache X-Sendfile on a specific view.""" -from django_downloadview.decorators import DownloadDecorator from django_downloadview.apache.middlewares import XSendfileMiddleware +from django_downloadview.decorators import DownloadDecorator def x_sendfile(view_func, *args, **kwargs): diff --git a/django_downloadview/apache/middlewares.py b/django_downloadview/apache/middlewares.py index 37bf5c4..f30cc42 100644 --- a/django_downloadview/apache/middlewares.py +++ b/django_downloadview/apache/middlewares.py @@ -1,7 +1,7 @@ from django_downloadview.apache.response import XSendfileResponse from django_downloadview.middlewares import ( - ProxiedDownloadMiddleware, NoRedirectionMatch, + ProxiedDownloadMiddleware, ) diff --git a/django_downloadview/api.py b/django_downloadview/api.py index e584343..933911f 100644 --- a/django_downloadview/api.py +++ b/django_downloadview/api.py @@ -1,31 +1,25 @@ """Declaration of API shortcuts.""" +from django_downloadview.files import HTTPFile, StorageFile, VirtualFile # NoQA from django_downloadview.io import BytesIteratorIO, TextIteratorIO # NoQA -from django_downloadview.files import StorageFile, VirtualFile, HTTPFile # NoQA -from django_downloadview.response import ( - DownloadResponse, # NoQA - ProxiedDownloadResponse, -) +from django_downloadview.middlewares import BaseDownloadMiddleware # NoQA from django_downloadview.middlewares import ( - BaseDownloadMiddleware, # NoQA DownloadDispatcherMiddleware, SmartDownloadMiddleware, ) +from django_downloadview.response import DownloadResponse # NoQA +from django_downloadview.response import ProxiedDownloadResponse +from django_downloadview.shortcuts import sendfile # NoQA +from django_downloadview.test import assert_download_response # NoQA +from django_downloadview.test import setup_view, temporary_media_root +from django_downloadview.views import PathDownloadView # NoQA from django_downloadview.views import ( - PathDownloadView, # NoQA - ObjectDownloadView, - StorageDownloadView, - HTTPDownloadView, - VirtualDownloadView, BaseDownloadView, DownloadMixin, + HTTPDownloadView, + ObjectDownloadView, + StorageDownloadView, + VirtualDownloadView, ) -from django_downloadview.shortcuts import sendfile # NoQA -from django_downloadview.test import ( - assert_download_response, # NoQA - setup_view, - temporary_media_root, -) - # Backward compatibility. StringIteratorIO = TextIteratorIO diff --git a/django_downloadview/files.py b/django_downloadview/files.py index c09cab8..f755bed 100644 --- a/django_downloadview/files.py +++ b/django_downloadview/files.py @@ -1,13 +1,12 @@ """File wrappers for use as exchange data between views and responses.""" -from io import BytesIO from urllib.parse import urlparse +import requests from django.core.files.base import File from django.utils.encoding import force_bytes -import requests - from django_downloadview.io import BytesIteratorIO +from io import BytesIO class StorageFile(File): diff --git a/django_downloadview/io.py b/django_downloadview/io.py index c0415cc..0fefac0 100644 --- a/django_downloadview/io.py +++ b/django_downloadview/io.py @@ -1,7 +1,7 @@ """Low-level IO operations, for use with file wrappers.""" -import io +from django.utils.encoding import force_bytes, force_text -from django.utils.encoding import force_text, force_bytes +import io class TextIteratorIO(io.TextIOBase): diff --git a/django_downloadview/lighttpd/__init__.py b/django_downloadview/lighttpd/__init__.py index 9f750fe..fb2c7df 100644 --- a/django_downloadview/lighttpd/__init__.py +++ b/django_downloadview/lighttpd/__init__.py @@ -8,6 +8,6 @@ See also `documentation of X-Sendfile for Lighttpd """ # API shortcuts. from django_downloadview.lighttpd.decorators import x_sendfile # NoQA +from django_downloadview.lighttpd.middlewares import XSendfileMiddleware # NoQA from django_downloadview.lighttpd.response import XSendfileResponse # NoQA from django_downloadview.lighttpd.tests import assert_x_sendfile # NoQA -from django_downloadview.lighttpd.middlewares import XSendfileMiddleware # NoQA diff --git a/django_downloadview/lighttpd/middlewares.py b/django_downloadview/lighttpd/middlewares.py index ceb70a7..136bdb0 100644 --- a/django_downloadview/lighttpd/middlewares.py +++ b/django_downloadview/lighttpd/middlewares.py @@ -1,7 +1,7 @@ from django_downloadview.lighttpd.response import XSendfileResponse from django_downloadview.middlewares import ( - ProxiedDownloadMiddleware, NoRedirectionMatch, + ProxiedDownloadMiddleware, ) diff --git a/django_downloadview/middlewares.py b/django_downloadview/middlewares.py index e16b784..8f5b9a7 100644 --- a/django_downloadview/middlewares.py +++ b/django_downloadview/middlewares.py @@ -4,13 +4,16 @@ Download middlewares capture :py:class:`django_downloadview.DownloadResponse` responses and may replace them with optimized download responses. """ -import copy import collections +import copy import os from django.conf import settings from django.core.exceptions import ImproperlyConfigured +from django_downloadview.response import DownloadResponse +from django_downloadview.utils import import_member + try: from django.utils.deprecation import MiddlewareMixin except ImportError: @@ -20,10 +23,6 @@ except ImportError: super(MiddlewareMixin, self).__init__() -from django_downloadview.response import DownloadResponse -from django_downloadview.utils import import_member - - #: Sentinel value to detect whether configuration is to be loaded from Django #: settings or not. AUTO_CONFIGURE = object() diff --git a/django_downloadview/nginx/__init__.py b/django_downloadview/nginx/__init__.py index 58a1cf6..7e420f8 100644 --- a/django_downloadview/nginx/__init__.py +++ b/django_downloadview/nginx/__init__.py @@ -7,6 +7,6 @@ See also `Nginx X-accel documentation `_ and """ # API shortcuts. from django_downloadview.nginx.decorators import x_accel_redirect # NoQA +from django_downloadview.nginx.middlewares import XAccelRedirectMiddleware # NoQA from django_downloadview.nginx.response import XAccelRedirectResponse # NoQA from django_downloadview.nginx.tests import assert_x_accel_redirect # NoQA -from django_downloadview.nginx.middlewares import XAccelRedirectMiddleware # NoQA diff --git a/django_downloadview/nginx/middlewares.py b/django_downloadview/nginx/middlewares.py index 6fc730d..3592937 100644 --- a/django_downloadview/nginx/middlewares.py +++ b/django_downloadview/nginx/middlewares.py @@ -4,8 +4,8 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django_downloadview.middlewares import ( - ProxiedDownloadMiddleware, NoRedirectionMatch, + ProxiedDownloadMiddleware, ) from django_downloadview.nginx.response import XAccelRedirectResponse diff --git a/django_downloadview/nginx/settings.py b/django_downloadview/nginx/settings.py index 2375ad2..862b61b 100644 --- a/django_downloadview/nginx/settings.py +++ b/django_downloadview/nginx/settings.py @@ -12,7 +12,6 @@ import warnings from django.conf import settings from django.core.exceptions import ImproperlyConfigured - # In version 1.3, former XAccelRedirectMiddleware has been renamed to # SingleXAccelRedirectMiddleware. So tell the users. deprecated_middleware = "django_downloadview.nginx.XAccelRedirectMiddleware" diff --git a/django_downloadview/response.py b/django_downloadview/response.py index 41ced52..97eb73c 100644 --- a/django_downloadview/response.py +++ b/django_downloadview/response.py @@ -1,6 +1,6 @@ """:py:class:`django.http.HttpResponse` subclasses.""" -import os import mimetypes +import os import re import unicodedata from urllib.parse import quote diff --git a/django_downloadview/utils.py b/django_downloadview/utils.py index b45a82c..2354e18 100644 --- a/django_downloadview/utils.py +++ b/django_downloadview/utils.py @@ -1,7 +1,6 @@ """Utility functions that may be implemented in external packages.""" import re - charset_pattern = re.compile(r"charset=(?P.+)$", re.I | re.U) diff --git a/django_downloadview/views/__init__.py b/django_downloadview/views/__init__.py index 09ac9c1..9a78444 100644 --- a/django_downloadview/views/__init__.py +++ b/django_downloadview/views/__init__.py @@ -1,8 +1,8 @@ """Views to stream files.""" # API shortcuts. -from django_downloadview.views.base import DownloadMixin, BaseDownloadView # NoQA +from django_downloadview.views.base import BaseDownloadView, DownloadMixin # NoQA +from django_downloadview.views.http import HTTPDownloadView # NoQA +from django_downloadview.views.object import ObjectDownloadView # NoQA from django_downloadview.views.path import PathDownloadView # NoQA from django_downloadview.views.storage import StorageDownloadView # NoQA -from django_downloadview.views.object import ObjectDownloadView # NoQA -from django_downloadview.views.http import HTTPDownloadView # NoQA from django_downloadview.views.virtual import VirtualDownloadView # NoQA diff --git a/django_downloadview/views/base.py b/django_downloadview/views/base.py index b3479c7..df20973 100644 --- a/django_downloadview/views/base.py +++ b/django_downloadview/views/base.py @@ -2,7 +2,7 @@ :class:`BaseDownloadView`""" import calendar -from django.http import HttpResponseNotModified, Http404 +from django.http import Http404, HttpResponseNotModified from django.views.generic.base import View from django.views.static import was_modified_since diff --git a/tests/api.py b/tests/api.py index 252b56d..1fadaea 100644 --- a/tests/api.py +++ b/tests/api.py @@ -1,10 +1,10 @@ """Test suite around :mod:`django_downloadview.api` and deprecation plan.""" -from importlib import import_module, reload import unittest import warnings +from importlib import import_module, reload -from django.core.exceptions import ImproperlyConfigured import django.test +from django.core.exceptions import ImproperlyConfigured from django.test.utils import override_settings diff --git a/tests/io.py b/tests/io.py index b5958b2..565735b 100644 --- a/tests/io.py +++ b/tests/io.py @@ -1,8 +1,7 @@ """Tests around :mod:`django_downloadview.io`.""" import unittest -from django_downloadview import TextIteratorIO, BytesIteratorIO - +from django_downloadview import BytesIteratorIO, TextIteratorIO HELLO_TEXT = u"Hello world!\né\n" HELLO_BYTES = b"Hello world!\n\xc3\xa9\n" diff --git a/tests/packaging.py b/tests/packaging.py index ffe50da..1b79bdb 100644 --- a/tests/packaging.py +++ b/tests/packaging.py @@ -2,7 +2,6 @@ import os import unittest - tests_dir = os.path.dirname(os.path.abspath(__file__)) project_dir = os.path.dirname(tests_dir) build_dir = os.path.join(project_dir, "var", "docs", "html") diff --git a/tests/sendfile.py b/tests/sendfile.py index 21ee719..1a4f16e 100644 --- a/tests/sendfile.py +++ b/tests/sendfile.py @@ -1,6 +1,6 @@ """Tests around :py:mod:`django_downloadview.sendfile`.""" -from django.http import Http404 import django.test +from django.http import Http404 from django_downloadview.response import DownloadResponse from django_downloadview.shortcuts import sendfile diff --git a/tests/views.py b/tests/views.py index 0d0d0d7..acd96f5 100644 --- a/tests/views.py +++ b/tests/views.py @@ -3,20 +3,15 @@ import calendar import os import unittest from datetime import datetime +from unittest import mock -try: - from unittest import mock -except ImportError: - import mock - +import django.test from django.core.files import File from django.http import Http404 from django.http.response import HttpResponseNotModified -import django.test -from django_downloadview import exceptions +from django_downloadview import exceptions, views from django_downloadview.test import setup_view -from django_downloadview import views class DownloadMixinTestCase(unittest.TestCase):