Merge git://github.com/sebpiq/django-rest-framework into develop

1 files changed, 8 insertions, 8 deletions

diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py
index cc338cc0..15b3579d 100644
--- a/djangorestframework/resources.py
+++ b/djangorestframework/resources.py
@@ -2,7 +2,7 @@ from django import forms
 from django.core.urlresolvers import reverse, get_urlconf, get_resolver, NoReverseMatch
 from django.db import models
 
-from djangorestframework.response import ErrorResponse
+from djangorestframework.response import ImmediateResponse
 from djangorestframework.serializer import Serializer, _SkipField
 from djangorestframework.utils import as_tuple
 
@@ -22,7 +22,7 @@ class BaseResource(Serializer):
     def validate_request(self, data, files=None):
         """
         Given the request content return the cleaned, validated content.
-        Typically raises a :exc:`response.ErrorResponse` with status code 400 (Bad Request) on failure.
+        Typically raises a :exc:`response.ImmediateResponse` with status code 400 (Bad Request) on failure.
         """
         return data
 
@@ -73,19 +73,19 @@ class FormResource(Resource):
     """
     Flag to check for unknown fields when validating a form. If set to false and
     we receive request data that is not expected by the form it raises an
-    :exc:`response.ErrorResponse` with status code 400. If set to true, only
+    :exc:`response.ImmediateResponse` with status code 400. If set to true, only
     expected fields are validated.
     """
 
     def validate_request(self, data, files=None):
         """
         Given some content as input return some cleaned, validated content.
-        Raises a :exc:`response.ErrorResponse` with status code 400 (Bad Request) on failure.
+        Raises a :exc:`response.ImmediateResponse` with status code 400 (Bad Request) on failure.
 
         Validation is standard form validation, with an additional constraint that *no extra unknown fields* may be supplied
         if :attr:`self.allow_unknown_form_fields` is ``False``.
 
-        On failure the :exc:`response.ErrorResponse` content is a dict which may contain :obj:`'errors'` and :obj:`'field-errors'` keys.
+        On failure the :exc:`response.ImmediateResponse` content is a dict which may contain :obj:`'errors'` and :obj:`'field-errors'` keys.
         If the :obj:`'errors'` key exists it is a list of strings of non-field errors.
         If the :obj:`'field-errors'` key exists it is a dict of ``{'field name as string': ['errors as strings', ...]}``.
         """
@@ -174,7 +174,7 @@ class FormResource(Resource):
                 detail[u'field_errors'] = field_errors
 
         # Return HTTP 400 response (BAD REQUEST)
-        raise ErrorResponse(400, detail)
+        raise ImmediateResponse(detail, status=400)
 
     def get_form_class(self, method=None):
         """
@@ -273,14 +273,14 @@ class ModelResource(FormResource):
     def validate_request(self, data, files=None):
         """
         Given some content as input return some cleaned, validated content.
-        Raises a :exc:`response.ErrorResponse` with status code 400 (Bad Request) on failure.
+        Raises a :exc:`response.ImmediateResponse` with status code 400 (Bad Request) on failure.
 
         Validation is standard form or model form validation,
         with an additional constraint that no extra unknown fields may be supplied,
         and that all fields specified by the fields class attribute must be supplied,
         even if they are not validated by the form/model form.
 
-        On failure the ErrorResponse content is a dict which may contain :obj:`'errors'` and :obj:`'field-errors'` keys.
+        On failure the ImmediateResponse content is a dict which may contain :obj:`'errors'` and :obj:`'field-errors'` keys.
         If the :obj:`'errors'` key exists it is a list of strings of non-field errors.
         If the ''field-errors'` key exists it is a dict of {field name as string: list of errors as strings}.
         """