Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 0 insertions, 44 deletions

diff --git a/djangorestframework/response.py b/djangorestframework/response.py
deleted file mode 100644
index 13f0477e..00000000
--- a/djangorestframework/response.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-The :mod:`response` module provides Response classes you can use in your
-views to return a certain HTTP response. Typically a response is *rendered*
-into a HTTP response depending on what renderers are set on your view and
-als depending on the accept header of the request.
-"""
-
-from django.core.handlers.wsgi import STATUS_CODE_TEXT
-
-__all__ = ('Response', 'ErrorResponse')
-
-# TODO: remove raw_content/cleaned_content and just use content?
-
-
-class Response(object):
-    """
-    An HttpResponse that may include content that hasn't yet been serialized.
-    """
-
-    def __init__(self, status=200, content=None, headers=None):
-        self.status = status
-        self.media_type = None
-        self.has_content_body = content is not None
-        self.raw_content = content      # content prior to filtering
-        self.cleaned_content = content  # content after filtering
-        self.headers = headers or {}
-
-    @property
-    def status_text(self):
-        """
-        Return reason text corresponding to our HTTP response status code.
-        Provided for convenience.
-        """
-        return STATUS_CODE_TEXT.get(self.status, '')
-
-
-class ErrorResponse(Exception):
-    """
-    An exception representing an Response that should be returned immediately.
-    Any content should be serialized as-is, without being filtered.
-    """
-
-    def __init__(self, status, content=None, headers={}):
-        self.response = Response(status, content=content, headers=headers)