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

diff --git a/djangorestframework/reverse.py b/djangorestframework/reverse.py
deleted file mode 100644
index ba663f98..00000000
--- a/djangorestframework/reverse.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Provide reverse functions that return fully qualified URLs
-"""
-from django.core.urlresolvers import reverse as django_reverse
-from django.utils.functional import lazy
-
-
-def reverse(viewname, *args, **kwargs):
-    """
-    Same as `django.core.urlresolvers.reverse`, but optionally takes a request
-    and returns a fully qualified URL, using the request to get the base URL.
-    """
-    request = kwargs.pop('request', None)
-    url = django_reverse(viewname, *args, **kwargs)
-    if request:
-        return request.build_absolute_uri(url)
-    return url
-
-
-reverse_lazy = lazy(reverse, str)