Commit 90511662 authored by Diederik van der Boor's avatar Diederik van der Boor
Browse files

isort

parent 670b595d
#-*- coding: utf-8 -*- #-*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
import datetime
import logging import logging
import os import os
import posixpath import posixpath
...@@ -9,12 +10,11 @@ from django.core.exceptions import ValidationError ...@@ -9,12 +10,11 @@ from django.core.exceptions import ValidationError
from django.core.files.uploadedfile import UploadedFile from django.core.files.uploadedfile import UploadedFile
from django.db import models from django.db import models
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import force_str, force_text
from django.utils.six import string_types from django.utils.six import string_types
from .storage import private_storage from django.utils.translation import ugettext_lazy as _
import datetime from .storage import private_storage
from django.utils.encoding import force_str, force_text
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
import mimetypes import mimetypes
from django.core.files.storage import Storage, File from django.core.files.storage import File, Storage
from django.utils.functional import cached_property from django.utils.functional import cached_property
......
...@@ -7,8 +7,7 @@ import time ...@@ -7,8 +7,7 @@ import time
from django.conf import settings from django.conf import settings
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.http import FileResponse, HttpResponse from django.http import FileResponse, HttpResponse, HttpResponseNotModified
from django.http import HttpResponseNotModified
from django.utils.http import http_date from django.utils.http import http_date
from django.utils.lru_cache import lru_cache from django.utils.lru_cache import lru_cache
from django.utils.module_loading import import_string from django.utils.module_loading import import_string
......
...@@ -5,12 +5,13 @@ from django.core.files.storage import FileSystemStorage ...@@ -5,12 +5,13 @@ from django.core.files.storage import FileSystemStorage
from django.utils.deconstruct import deconstructible from django.utils.deconstruct import deconstructible
from django.utils.encoding import force_text from django.utils.encoding import force_text
from private_storage import appconfig
try: try:
from django.urls import reverse_lazy # Added in Django 1.10 from django.urls import reverse_lazy # Added in Django 1.10
except ImportError: except ImportError:
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
from private_storage import appconfig
@deconstructible @deconstructible
......
...@@ -3,9 +3,10 @@ try: ...@@ -3,9 +3,10 @@ try:
except ImportError: except ImportError:
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.deconstruct import deconstructible from django.utils.deconstruct import deconstructible
from private_storage import appconfig
from storages.backends.s3boto3 import S3Boto3Storage from storages.backends.s3boto3 import S3Boto3Storage
from storages.utils import setting from storages.utils import setting
from private_storage import appconfig
@deconstructible @deconstructible
......
# Most pathetic test case ever, only see if all files are importable. # Most pathetic test case ever, only see if all files are importable.
# TODO: write real tests. # TODO: write real tests.
import private_storage import private_storage
import private_storage.storage.files
import private_storage.storage.s3boto3
import private_storage.appconfig import private_storage.appconfig
import private_storage.fields import private_storage.fields
import private_storage.models import private_storage.models
import private_storage.permissions import private_storage.permissions
import private_storage.servers import private_storage.servers
import private_storage.storage.files
import private_storage.storage.s3boto3
import private_storage.urls import private_storage.urls
import private_storage.views import private_storage.views
from django.conf.urls import url from django.conf.urls import url
from .views import PrivateStorageView from .views import PrivateStorageView
urlpatterns = [ urlpatterns = [
......
...@@ -3,12 +3,7 @@ Views to send private files. ...@@ -3,12 +3,7 @@ Views to send private files.
""" """
import os import os
try: from django.http import Http404, HttpResponseForbidden
from urllib.parse import quote
except ImportError:
from urllib import quote # Python 2
from django.http import HttpResponseForbidden, Http404
from django.utils.module_loading import import_string from django.utils.module_loading import import_string
from django.views.generic import View from django.views.generic import View
from django.views.generic.detail import SingleObjectMixin from django.views.generic.detail import SingleObjectMixin
...@@ -18,6 +13,13 @@ from .models import PrivateFile ...@@ -18,6 +13,13 @@ from .models import PrivateFile
from .servers import get_server_class from .servers import get_server_class
from .storage import private_storage from .storage import private_storage
try:
from urllib.parse import quote
except ImportError:
from urllib import quote # Python 2
class PrivateStorageView(View): class PrivateStorageView(View):
""" """
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment