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

diff --git a/djangorestframework/utils/breadcrumbs.py b/djangorestframework/utils/breadcrumbs.py
deleted file mode 100644
index 84dd3dfa..00000000
--- a/djangorestframework/utils/breadcrumbs.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from django.core.urlresolvers import resolve
-
-
-def get_breadcrumbs(url):
-    """Given a url returns a list of breadcrumbs, which are each a tuple of (name, url)."""
-
-    from djangorestframework.views import APIView
-
-    def breadcrumbs_recursive(url, breadcrumbs_list):
-        """Add tuples of (name, url) to the breadcrumbs list, progressively chomping off parts of the url."""
-
-        try:
-            (view, unused_args, unused_kwargs) = resolve(url)
-        except Exception:
-            pass
-        else:
-            # Check if this is a REST framework view, and if so add it to the breadcrumbs
-            if isinstance(getattr(view, 'cls_instance', None), APIView):
-                breadcrumbs_list.insert(0, (view.cls_instance.get_name(), url))
-
-        if url == '':
-            # All done
-            return breadcrumbs_list
-
-        elif url.endswith('/'):
-            # Drop trailing slash off the end and continue to try to resolve more breadcrumbs
-            return breadcrumbs_recursive(url.rstrip('/'), breadcrumbs_list)
-
-        # Drop trailing non-slash off the end and continue to try to resolve more breadcrumbs
-        return breadcrumbs_recursive(url[:url.rfind('/') + 1], breadcrumbs_list)
-
-    return breadcrumbs_recursive(url, [])