encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 06:14:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

convert datetimes to the appropriate timezone on their way out

Browse Source
This commit is contained in:
Tim Saylor 2015-07-09 13:01:19 -05:00
parent a825098440
commit 48e75379c1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/fields.py
View File

@ -941,6 +941,11 @@ class DateTimeField(Field):
self.fail('invalid', format=humanized_format) self.fail('invalid', format=humanized_format)
def to_representation(self, value): def to_representation(self, value):
if timezone.is_aware(value):
# convert the datetime to the timezone the user is expecting
tz = getattr(timezone._active, "value", self.default_timezone)
value = timezone.localtime(value, tz)
if self.format is None: if self.format is None:
return value return value