mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-22 20:55:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed a stupid bug in the implementation of timezone.make_aware.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-01-02 20:45:09 +00:00
parent b895b297a6
commit fc9e0606d5
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/utils/timezone.py
View file

@ -267,5 +267,5 @@ def make_naive(value, timezone):
value = value.astimezone(timezone)
if hasattr(timezone, 'normalize'):
# available for pytz time zones
return timezone.normalize(value)
value = timezone.normalize(value)
return value.replace(tzinfo=None)