summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
Diffstat (limited to 'django/core')
-rw-r--r--django/core/cache/backends/db.py4
-rw-r--r--django/core/files/storage/filesystem.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py
index f41105177f..d231d66b2f 100644
--- a/django/core/cache/backends/db.py
+++ b/django/core/cache/backends/db.py
@@ -1,7 +1,7 @@
"Database cache backend."
import base64
import pickle
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from django.conf import settings
from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache
@@ -124,7 +124,7 @@ class DatabaseCache(BaseDatabaseCache):
if timeout is None:
exp = datetime.max
else:
- tz = timezone.utc if settings.USE_TZ else None
+ tz = UTC if settings.USE_TZ else None
exp = datetime.fromtimestamp(timeout, tz=tz)
exp = exp.replace(microsecond=0)
if num > self._max_entries:
diff --git a/django/core/files/storage/filesystem.py b/django/core/files/storage/filesystem.py
index 54c31e536a..428ae61b40 100644
--- a/django/core/files/storage/filesystem.py
+++ b/django/core/files/storage/filesystem.py
@@ -1,5 +1,5 @@
import os
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from urllib.parse import urljoin
from django.conf import settings
@@ -215,7 +215,7 @@ class FileSystemStorage(Storage, StorageSettingsMixin):
If timezone support is enabled, make an aware datetime object in UTC;
otherwise make a naive one in the local timezone.
"""
- tz = timezone.utc if settings.USE_TZ else None
+ tz = UTC if settings.USE_TZ else None
return datetime.fromtimestamp(ts, tz=tz)
def get_accessed_time(self, name):