diff options
| author | Tom Christie | 2013-06-28 09:36:17 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-06-28 09:36:17 +0100 |
| commit | 05d8a90e946f63adeb1978fca02e96230425c41a (patch) | |
| tree | c5f6ead236ec75307cdfd4d3cde344b7f53d3b7d | |
| parent | b36ece7f70919d08e0dfcae45e3f27386f64a274 (diff) | |
| parent | 4ee9cdc7aff30fc3f45e78292da77b5989bb0e23 (diff) | |
| download | django-rest-framework-05d8a90e946f63adeb1978fca02e96230425c41a.tar.bz2 | |
Merge branch 'master' into writable-nested-modelserializer
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | rest_framework/compat.py | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -4,6 +4,7 @@ .* html/ +htmlcov/ coverage/ build/ dist/ diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b748dcc5..cb122846 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -494,7 +494,8 @@ try: if provider_version in ('0.2.3', '0.2.4'): # 0.2.3 and 0.2.4 are supported version that do not support # timezone aware datetimes - from datetime.datetime import now as provider_now + import datetime + provider_now = datetime.datetime.now else: # Any other supported version does use timezone aware datetimes from django.utils.timezone import now as provider_now |