mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.5.x] Fixed #19708 -- Exception in timezone.override(None).

Browse Source 
Thanks rafales.

Backport of 9a4a1ce.
This commit is contained in:
Aymeric Augustin
2013-01-31 16:00:39 +01:00
parent 73bb9664da
commit db49b6d2b2
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/timezone.py
View File

@@ -111,6 +111,7 @@ def get_default_timezone():
if isinstance(settings.TIME_ZONE, six.string_types) and pytz is not None:
_localtime = pytz.timezone(settings.TIME_ZONE)
else:
# This relies on os.environ['TZ'] being set to settings.TIME_ZONE.
_localtime = LocalTimezone()
return _localtime
@@ -198,10 +199,10 @@ class override(object):
activate(self.timezone)
def __exit__(self, exc_type, exc_value, traceback):
if self.old_timezone is not None:
_active.value = self.old_timezone
if self.old_timezone is None:
deactivate()
else:
del _active.value
_active.value = self.old_timezone
# Templates