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

diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py
deleted file mode 100644
index 01ba19b9..00000000
--- a/djangorestframework/tests/reverse.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from django.conf.urls.defaults import patterns, url
-from django.test import TestCase
-from django.utils import simplejson as json
-
-from djangorestframework.renderers import JSONRenderer
-from djangorestframework.reverse import reverse, reverse_lazy
-from djangorestframework.views import View
-
-
-class ReverseView(View):
-    """
-    Mock resource which simply returns a URL, so that we can ensure
-    that reversed URLs are fully qualified.
-    """
-    renderers = (JSONRenderer, )
-
-    def get(self, request):
-        return reverse('reverse', request=request)
-
-
-class LazyView(View):
-    """
-    Mock resource which simply returns a URL, so that we can ensure
-    that reversed URLs are fully qualified.
-    """
-    renderers = (JSONRenderer, )
-
-    def get(self, request):
-        return reverse_lazy('lazy', request=request)
-
-
-urlpatterns = patterns('',
-    url(r'^reverse$', ReverseView.as_view(), name='reverse'),
-    url(r'^lazy$', LazyView.as_view(), name='lazy'),
-)
-
-
-class ReverseTests(TestCase):
-    """
-    Tests for fully qualifed URLs when using `reverse`.
-    """
-    urls = 'djangorestframework.tests.reverse'
-
-    def test_reversed_urls_are_fully_qualified(self):
-        response = self.client.get('/reverse')
-        self.assertEqual(json.loads(response.content),
-                        'http://testserver/reverse')
-
-    #def test_reversed_lazy_urls_are_fully_qualified(self):
-    #    response = self.client.get('/lazy')
-    #    self.assertEqual(json.loads(response.content),
-    #                     'http://testserver/lazy')