summaryrefslogtreecommitdiff
path: root/django/utils/timezone.py
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2018-07-10 01:33:36 +0500
committerTim Graham <timograham@gmail.com>2018-07-09 16:33:36 -0400
commit338f741c5eb6b91118f6a6b7c34b5e9b47a5661d (patch)
tree59aec697df420724fe2af579489e5a5bac6f22e2 /django/utils/timezone.py
parent8b1d361f28c80cb0fa84a3714d711174bd25cdfa (diff)
Fixed #29546 -- Deprecated django.utils.timezone.FixedOffset.
Diffstat (limited to 'django/utils/timezone.py')
-rw-r--r--django/utils/timezone.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/django/utils/timezone.py b/django/utils/timezone.py
index c1f0d70bc1..25767e6047 100644
--- a/django/utils/timezone.py
+++ b/django/utils/timezone.py
@@ -3,13 +3,15 @@ Timezone-related classes and functions.
"""
import functools
+import warnings
from contextlib import ContextDecorator
-from datetime import datetime, timedelta, tzinfo
+from datetime import datetime, timedelta, timezone, tzinfo
from threading import local
import pytz
from django.conf import settings
+from django.utils.deprecation import RemovedInDjango31Warning
__all__ = [
'utc', 'get_fixed_timezone',
@@ -36,6 +38,10 @@ class FixedOffset(tzinfo):
"""
def __init__(self, offset=None, name=None):
+ warnings.warn(
+ 'FixedOffset is deprecated in favor of datetime.timezone',
+ RemovedInDjango31Warning, stacklevel=2,
+ )
if offset is not None:
self.__offset = timedelta(minutes=offset)
if name is not None:
@@ -62,7 +68,7 @@ def get_fixed_timezone(offset):
sign = '-' if offset < 0 else '+'
hhmm = '%02d%02d' % divmod(abs(offset), 60)
name = sign + hhmm
- return FixedOffset(offset, name)
+ return timezone(timedelta(minutes=offset), name)
# In order to avoid accessing settings at compile time,