From b443560080a20d52a3dd49f625a103810935affd Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 8 May 2013 20:38:50 +0100
Subject: Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings.  Closes #798

---
 rest_framework/fields.py   | 6 +++---
 rest_framework/settings.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index f934fc39..c83ee5ec 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -500,7 +500,7 @@ class DateField(WritableField):
     }
     empty = None
     input_formats = api_settings.DATE_INPUT_FORMATS
-    format = None
+    format = api_settings.DATE_FORMAT
 
     def __init__(self, input_formats=None, format=None, *args, **kwargs):
         self.input_formats = input_formats if input_formats is not None else self.input_formats
@@ -563,7 +563,7 @@ class DateTimeField(WritableField):
     }
     empty = None
     input_formats = api_settings.DATETIME_INPUT_FORMATS
-    format = None
+    format = api_settings.DATETIME_FORMAT
 
     def __init__(self, input_formats=None, format=None, *args, **kwargs):
         self.input_formats = input_formats if input_formats is not None else self.input_formats
@@ -632,7 +632,7 @@ class TimeField(WritableField):
     }
     empty = None
     input_formats = api_settings.TIME_INPUT_FORMATS
-    format = None
+    format = api_settings.TIME_FORMAT
 
     def __init__(self, input_formats=None, format=None, *args, **kwargs):
         self.input_formats = input_formats if input_formats is not None else self.input_formats
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,
-- 
cgit v1.2.3