diff options
Diffstat (limited to 'django/core/files')
| -rw-r--r-- | django/core/files/move.py | 1 | ||||
| -rw-r--r-- | django/core/files/storage.py | 15 | ||||
| -rw-r--r-- | django/core/files/temp.py | 1 | ||||
| -rw-r--r-- | django/core/files/uploadedfile.py | 2 | ||||
| -rw-r--r-- | django/core/files/uploadhandler.py | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/django/core/files/move.py b/django/core/files/move.py index 124529d9b9..f3972c5f98 100644 --- a/django/core/files/move.py +++ b/django/core/files/move.py @@ -10,7 +10,6 @@ from shutil import copystat from django.core.files import locks - __all__ = ['file_move_safe'] diff --git a/django/core/files/storage.py b/django/core/files/storage.py index 90ab1be27a..65b6d46463 100644 --- a/django/core/files/storage.py +++ b/django/core/files/storage.py @@ -1,23 +1,22 @@ -from datetime import datetime import errno -from inspect import getargspec import os import warnings +from datetime import datetime +from inspect import getargspec from django.conf import settings from django.core.exceptions import SuspiciousFileOperation -from django.core.files import locks, File +from django.core.files import File, locks from django.core.files.move import file_move_safe +from django.utils._os import abspathu, safe_join from django.utils.crypto import get_random_string -from django.utils.encoding import force_text, filepath_to_uri +from django.utils.deconstruct import deconstructible +from django.utils.deprecation import RemovedInDjango20Warning +from django.utils.encoding import filepath_to_uri, force_text from django.utils.functional import LazyObject from django.utils.module_loading import import_string from django.utils.six.moves.urllib.parse import urljoin from django.utils.text import get_valid_filename -from django.utils._os import safe_join, abspathu -from django.utils.deconstruct import deconstructible -from django.utils.deprecation import RemovedInDjango20Warning - __all__ = ('Storage', 'FileSystemStorage', 'DefaultStorage', 'default_storage') diff --git a/django/core/files/temp.py b/django/core/files/temp.py index 19849a4260..0791b8536e 100644 --- a/django/core/files/temp.py +++ b/django/core/files/temp.py @@ -18,6 +18,7 @@ full range of keyword arguments available in Python 2.6+ and 3.0+. import os import tempfile + from django.core.files.utils import FileProxyMixin __all__ = ('NamedTemporaryFile', 'gettempdir',) diff --git a/django/core/files/uploadedfile.py b/django/core/files/uploadedfile.py index 9a94894424..20eaecea75 100644 --- a/django/core/files/uploadedfile.py +++ b/django/core/files/uploadedfile.py @@ -7,8 +7,8 @@ import os from io import BytesIO from django.conf import settings -from django.core.files.base import File from django.core.files import temp as tempfile +from django.core.files.base import File from django.utils.encoding import force_str __all__ = ('UploadedFile', 'TemporaryUploadedFile', 'InMemoryUploadedFile', diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py index c6fddce331..e5a2667342 100644 --- a/django/core/files/uploadhandler.py +++ b/django/core/files/uploadhandler.py @@ -7,7 +7,9 @@ from __future__ import unicode_literals from io import BytesIO from django.conf import settings -from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUploadedFile +from django.core.files.uploadedfile import ( + InMemoryUploadedFile, TemporaryUploadedFile, +) from django.utils.encoding import python_2_unicode_compatible from django.utils.module_loading import import_string |
