Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits)
  Bits of cleanup
  Add request.QUERY_PARAMS
  Add readonly 'id' field
  Tweak browseable API
  Don't display readonly fields
  Fix some bits of serialization
  Add csrf note
  Fix incorrect bit of tutorial
  Added tox.ini
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Clean up bits of templates etc
  Hack out bunch of unneccesary private methods on View class
  Clean up template tags
  Remove dumbass __all__ variables
  Remove old 'djangorestframework directories
  Change package name: djangorestframework -> rest_framework
  Dont strip final '/'
  Use get_script_prefix to play nicely if not installed at the root.
  ...

Conflicts:
	rest_framework/decorators.py

1 files changed, 0 insertions, 35 deletions

diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py
deleted file mode 100644
index b4791135..00000000
--- a/djangorestframework/tests/reverse.py
+++ /dev/null
@@ -1,35 +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
-from djangorestframework.views import APIView
-from djangorestframework.response import Response
-
-
-class MyView(APIView):
-    """
-    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 Response(reverse('myview', request=request))
-
-
-urlpatterns = patterns('',
-    url(r'^myview$', MyView.as_view(), name='myview'),
-)
-
-
-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('/myview')
-        self.assertEqual(json.loads(response.content), 'http://testserver/myview')