encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 03:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into writable-nested-modelserializer

Browse Source
This commit is contained in:
Tom Christie 2013-06-28 09:36:17 +01:00
commit 05d8a90e94
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,6 +4,7 @@
.* .*
html/ html/
htmlcov/
coverage/ coverage/
build/ build/
dist/ dist/

3
rest_framework/compat.py
View File

@ -494,7 +494,8 @@ try:
if provider_version in ('0.2.3', '0.2.4'): if provider_version in ('0.2.3', '0.2.4'):
# 0.2.3 and 0.2.4 are supported version that do not support # 0.2.3 and 0.2.4 are supported version that do not support
# timezone aware datetimes # timezone aware datetimes
from datetime.datetime import now as provider_now import datetime
provider_now = datetime.datetime.now
else: else:
# Any other supported version does use timezone aware datetimes # Any other supported version does use timezone aware datetimes
from django.utils.timezone import now as provider_now from django.utils.timezone import now as provider_now