encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-07 22:04:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up test failures

Browse Source
This commit is contained in:
Tom Christie 2016-06-09 12:20:35 +01:00
parent b64340ba63
commit c890ad4d67
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/renderers.py
View File

@ -22,7 +22,7 @@ from django.utils import six
from rest_framework import VERSION, exceptions, serializers, status from rest_framework import VERSION, exceptions, serializers, status
from rest_framework.compat import ( from rest_framework.compat import (
coreapi, INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, coreapi,
template_render template_render
) )
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
@ -795,4 +795,4 @@ class CoreJSONRenderer(BaseRenderer):
def render(self, data, media_type=None, renderer_context=None): def render(self, data, media_type=None, renderer_context=None):
indent = bool(renderer_context.get('indent', 0)) indent = bool(renderer_context.get('indent', 0))
codec = coreapi.codecs.CoreJSONCodec() codec = coreapi.codecs.CoreJSONCodec()
return codec.dump(data, indent=True) return codec.dump(data, indent=indent)

2
rest_framework/routers.py
View File

@ -236,7 +236,6 @@ class SimpleRouter(BaseRouter):
""" """
Use the registered viewsets to generate a list of URL patterns. Use the registered viewsets to generate a list of URL patterns.
""" """
self.get_links()
ret = [] ret = []
for prefix, viewset, basename in self.registry: for prefix, viewset, basename in self.registry:
@ -264,7 +263,6 @@ class SimpleRouter(BaseRouter):
return ret return ret
def get_links(self): def get_links(self):
ret = []
content = {} content = {}
for prefix, viewset, basename in self.registry: for prefix, viewset, basename in self.registry: