From c890ad4d67e925ce4794daccad730b0f9e869547 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 9 Jun 2016 12:20:35 +0100 Subject: [PATCH] Clean up test failures --- rest_framework/renderers.py | 4 ++-- rest_framework/routers.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 1ec33deb7..511f5d474 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -22,7 +22,7 @@ from django.utils import six from rest_framework import VERSION, exceptions, serializers, status from rest_framework.compat import ( - coreapi, INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, + INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, coreapi, template_render ) from rest_framework.exceptions import ParseError @@ -795,4 +795,4 @@ class CoreJSONRenderer(BaseRenderer): def render(self, data, media_type=None, renderer_context=None): indent = bool(renderer_context.get('indent', 0)) codec = coreapi.codecs.CoreJSONCodec() - return codec.dump(data, indent=True) + return codec.dump(data, indent=indent) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 17ea5bacc..789f0217f 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -236,7 +236,6 @@ class SimpleRouter(BaseRouter): """ Use the registered viewsets to generate a list of URL patterns. """ - self.get_links() ret = [] for prefix, viewset, basename in self.registry: @@ -264,7 +263,6 @@ class SimpleRouter(BaseRouter): return ret def get_links(self): - ret = [] content = {} for prefix, viewset, basename in self.registry: