summaryrefslogtreecommitdiff
path: root/django/utils/timezone.py
diff options
context:
space:
mode:
authorThomas Chaumeny <thomas.chaumeny@polyconseil.fr>2014-08-28 22:26:37 +0200
committerSimon Charette <charette.s@gmail.com>2014-08-28 19:18:34 -0400
commitefcbf3e095dce3491eb52774978afe3f7bbdf217 (patch)
treed1a6a332f9840c9d33807e4b2687c9ccc8ac2f5f /django/utils/timezone.py
parent569e0a299ddf484a694d26b283214d1e55f7283e (diff)
Fixed #23381 -- Context manager restored state should be determined in __enter__
Diffstat (limited to 'django/utils/timezone.py')
-rw-r--r--django/utils/timezone.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/timezone.py b/django/utils/timezone.py
index c0ea04c7d8..b8e40b031c 100644
--- a/django/utils/timezone.py
+++ b/django/utils/timezone.py
@@ -262,9 +262,9 @@ class override(object):
"""
def __init__(self, timezone):
self.timezone = timezone
- self.old_timezone = getattr(_active, 'value', None)
def __enter__(self):
+ self.old_timezone = getattr(_active, 'value', None)
if self.timezone is None:
deactivate()
else: