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, 48 deletions

diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py
deleted file mode 100644
index 0db23804..00000000
--- a/examples/resourceexample/views.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from djangorestframework.reverse import reverse
-from djangorestframework.views import View
-from djangorestframework.response import Response
-from djangorestframework import status
-
-from resourceexample.forms import MyForm
-
-
-class ExampleView(View):
-    """
-    A basic read-only view that points to 3 other views.
-    """
-
-    def get(self, request):
-        """
-        Handle GET requests, returning a list of URLs pointing to 3 other views.
-        """
-        resource_urls = [reverse('another-example',
-                                 kwargs={'num': num},
-                                 request=request)
-                         for num in range(3)]
-        return {"Some other resources": resource_urls}
-
-
-class AnotherExampleView(View):
-    """
-    A basic view, that can be handle GET and POST requests.
-    Applies some simple form validation on POST requests.
-    """
-    form = MyForm
-
-    def get(self, request, num):
-        """
-        Handle GET requests.
-        Returns a simple string indicating which view the GET request was for.
-        """
-        if int(num) > 2:
-            return Response(status.HTTP_404_NOT_FOUND)
-        return "GET request to AnotherExampleResource %s" % num
-
-    def post(self, request, num):
-        """
-        Handle POST requests, with form validation.
-        Returns a simple string indicating what content was supplied.
-        """
-        if int(num) > 2:
-            return Response(status.HTTP_404_NOT_FOUND)
-        return "POST request to AnotherExampleResource %s, with content: %s" % (num, repr(self.CONTENT))