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

diff --git a/djangorestframework/utils/breadcrumbs.py b/djangorestframework/utils/breadcrumbs.py
deleted file mode 100644
index becdcad0..00000000
--- a/djangorestframework/utils/breadcrumbs.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from django.core.urlresolvers import resolve, get_script_prefix
-
-
-def get_breadcrumbs(url):
-    """Given a url returns a list of breadcrumbs, which are each a tuple of (name, url)."""
-
-    from djangorestframework.views import View
-
-    def breadcrumbs_recursive(url, breadcrumbs_list, prefix):
-        """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), View):
-                breadcrumbs_list.insert(0, (view.cls_instance.get_name(), prefix + 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, prefix)
-
-        # Drop trailing non-slash off the end and continue to try to resolve more breadcrumbs
-        return breadcrumbs_recursive(url[:url.rfind('/') + 1], breadcrumbs_list, prefix)
-
-    prefix = get_script_prefix().rstrip('/')
-    url = url[len(prefix):]
-    return breadcrumbs_recursive(url, [], prefix)