aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/mixins.py
diff options
context:
space:
mode:
authorTom Christie2012-08-21 01:38:21 -0700
committerTom Christie2012-08-21 01:38:21 -0700
commit8898111611a88d0875e3ccb3ff933a607494bfc6 (patch)
tree4a48a4abd80fec42fd429d92051dab6b63022c96 /djangorestframework/mixins.py
parent21b5601d3b91c1b79b3164f9019245cf8353d417 (diff)
parent0e3a2e6fdd800465b07817d780a981a18cb79880 (diff)
downloaddjango-rest-framework-8898111611a88d0875e3ccb3ff933a607494bfc6.tar.bz2
Merge pull request #224 from ralphje/master
Modify 415 error content
Diffstat (limited to 'djangorestframework/mixins.py')
-rw-r--r--djangorestframework/mixins.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 0f292b4e..4a453957 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -181,7 +181,7 @@ class RequestMixin(object):
return parser.parse(stream)
raise ErrorResponse(status.HTTP_415_UNSUPPORTED_MEDIA_TYPE,
- {'error': 'Unsupported media type in request \'%s\'.' %
+ {'detail': 'Unsupported media type in request \'%s\'.' %
content_type})
@property