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

diff --git a/djangorestframework/tests/methods.py b/djangorestframework/tests/methods.py
deleted file mode 100644
index 4b90a21f..00000000
--- a/djangorestframework/tests/methods.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from django.test import TestCase
-from djangorestframework.compat import RequestFactory
-from djangorestframework.mixins import RequestMixin
-
-
-class TestMethodOverloading(TestCase):
-    def setUp(self):
-        self.req = RequestFactory()
-
-    def test_standard_behaviour_determines_GET(self):
-        """GET requests identified"""
-        view = RequestMixin()
-        view.request = self.req.get('/')
-        self.assertEqual(view.method, 'GET')
-
-    def test_standard_behaviour_determines_POST(self):
-        """POST requests identified"""
-        view = RequestMixin()
-        view.request = self.req.post('/')
-        self.assertEqual(view.method, 'POST')
-
-    def test_overloaded_POST_behaviour_determines_overloaded_method(self):
-        """POST requests can be overloaded to another method by setting a reserved form field"""
-        view = RequestMixin()
-        view.request = self.req.post('/', {view._METHOD_PARAM: 'DELETE'})
-        self.assertEqual(view.method, 'DELETE')
-
-    def test_HEAD_is_a_valid_method(self):
-        """HEAD requests identified"""
-        view = RequestMixin()
-        view.request = self.req.head('/')
-        self.assertEqual(view.method, 'HEAD')