diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-09 13:19:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-09 14:24:06 -0500 |
| commit | a8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch) | |
| tree | 94ef5bc53e59131906aecfcf792eeac86242aa62 /tests/file_storage | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'tests/file_storage')
| -rw-r--r-- | tests/file_storage/models.py | 2 | ||||
| -rw-r--r-- | tests/file_storage/tests.py | 15 | ||||
| -rw-r--r-- | tests/file_storage/urls.py | 1 |
3 files changed, 8 insertions, 10 deletions
diff --git a/tests/file_storage/models.py b/tests/file_storage/models.py index 2f58c53ddd..45a3d9f0e7 100644 --- a/tests/file_storage/models.py +++ b/tests/file_storage/models.py @@ -9,8 +9,8 @@ import os import random import tempfile -from django.db import models from django.core.files.storage import FileSystemStorage +from django.db import models class OldStyleFSStorage(FileSystemStorage): diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py index 2718f07cad..2c08a5312f 100644 --- a/tests/file_storage/tests.py +++ b/tests/file_storage/tests.py @@ -13,20 +13,19 @@ import warnings from datetime import datetime, timedelta from django.core.cache import cache -from django.core.exceptions import SuspiciousOperation, SuspiciousFileOperation -from django.core.files.base import File, ContentFile +from django.core.exceptions import SuspiciousFileOperation, SuspiciousOperation +from django.core.files.base import ContentFile, File from django.core.files.storage import FileSystemStorage, get_storage_class -from django.core.files.uploadedfile import (InMemoryUploadedFile, SimpleUploadedFile, - TemporaryUploadedFile) -from django.test import LiveServerTestCase, SimpleTestCase -from django.test import override_settings +from django.core.files.uploadedfile import ( + InMemoryUploadedFile, SimpleUploadedFile, TemporaryUploadedFile, +) +from django.test import LiveServerTestCase, SimpleTestCase, override_settings from django.utils import six -from django.utils.six.moves.urllib.request import urlopen from django.utils._os import upath +from django.utils.six.moves.urllib.request import urlopen from .models import Storage, temp_storage, temp_storage_location - FILE_SUFFIX_REGEX = '[A-Za-z0-9]{7}' diff --git a/tests/file_storage/urls.py b/tests/file_storage/urls.py index 7d50ef46b8..2bf659f6a8 100644 --- a/tests/file_storage/urls.py +++ b/tests/file_storage/urls.py @@ -1,7 +1,6 @@ from django.conf.urls import url from django.http import HttpResponse - urlpatterns = [ url(r'^$', lambda req: HttpResponse('example view')), ] |
