From efcbf3e095dce3491eb52774978afe3f7bbdf217 Mon Sep 17 00:00:00 2001 From: Thomas Chaumeny Date: Thu, 28 Aug 2014 22:26:37 +0200 Subject: Fixed #23381 -- Context manager restored state should be determined in __enter__ --- django/utils/timezone.py | 2 +- django/utils/translation/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'django/utils') 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: diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index 70eb01d2d7..e8ef6bd353 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -154,9 +154,9 @@ class override(ContextDecorator): def __init__(self, language, deactivate=False): self.language = language self.deactivate = deactivate - self.old_language = get_language() def __enter__(self): + self.old_language = get_language() if self.language is not None: activate(self.language) else: -- cgit v1.3