aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorCarlton Gibson2014-05-08 09:34:06 +0200
committerCarlton Gibson2014-05-08 09:34:06 +0200
commit591d5240da63f9e18d245425809cc16beaf5d9d9 (patch)
tree8bf94e061cfc850a261d82f428ab14c88932690a /rest_framework/fields.py
parent4ce42fb72b707203c3883cea72ce0999794d2670 (diff)
parent11115fde9cc8f70dfd85ce937893d67fd061f3c1 (diff)
downloaddjango-rest-framework-591d5240da63f9e18d245425809cc16beaf5d9d9.tar.bz2
Merge pull request #1575 from ewdicus/iso8601
Add colon to time zone offset in readable_datetime_formats
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 8cdc5551..b19955cc 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -62,7 +62,7 @@ def get_component(obj, attr_name):
def readable_datetime_formats(formats):
format = ', '.join(formats).replace(ISO_8601,
- 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HHMM|-HHMM|Z]')
+ 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]')
return humanize_strptime(format)