Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions django_oss_storage/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@
from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
from django.core.files.storage import Storage
from django.conf import settings
from django.utils.encoding import force_text, force_bytes
try:
from django.utils.encoding import force_text
except ImportError:
from django.utils.encoding import force_str as force_text
from django.utils.deconstruct import deconstructible
from django.utils.timezone import utc
try:
from django.utils.timezone import utc
except ImportError:
from datetime import timezone
utc = timezone.utc
from tempfile import SpooledTemporaryFile

import oss2.utils
import oss2.exceptions
from oss2 import Auth, Service, Bucket, ObjectIterator, BUCKET_ACL_PRIVATE
Expand Down
7 changes: 6 additions & 1 deletion tests/django-oss-storage-test/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
from django.core.files.storage import default_storage
from django.contrib.staticfiles.storage import staticfiles_storage
from django.utils import timezone
from django.utils.timezone import is_naive, make_naive, utc
from django.utils.timezone import is_naive, make_naive
try:
from django.utils.timezone import utc
except ImportError:
from datetime import timezone
utc = timezone.utc
from django_oss_storage.backends import OssError, OssMediaStorage, OssStaticStorage, OssStorage, _get_config
from django_oss_storage import defaults
from oss2 import to_unicode
Expand Down