aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/settings.py
diff options
context:
space:
mode:
authorTom Christie2013-05-08 20:38:50 +0100
committerTom Christie2013-05-08 20:38:50 +0100
commitb443560080a20d52a3dd49f625a103810935affd (patch)
tree9eec82d93dc45b9fcff250ec1a003618ef0fac3c /rest_framework/settings.py
parentde69a28b9e786b8c759cda4acedb0a1b8542298b (diff)
downloaddjango-rest-framework-b443560080a20d52a3dd49f625a103810935affd.tar.bz2
Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798
Diffstat (limited to 'rest_framework/settings.py')
-rw-r--r--rest_framework/settings.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 734d8478..beb511ac 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -86,17 +86,17 @@ DEFAULTS = {
'DATE_INPUT_FORMATS': (
ISO_8601,
),
- 'DATE_FORMAT': ISO_8601,
+ 'DATE_FORMAT': None,
'DATETIME_INPUT_FORMATS': (
ISO_8601,
),
- 'DATETIME_FORMAT': ISO_8601,
+ 'DATETIME_FORMAT': None,
'TIME_INPUT_FORMATS': (
ISO_8601,
),
- 'TIME_FORMAT': ISO_8601,
+ 'TIME_FORMAT': None,
# Pending deprecation
'FILTER_BACKEND': None,