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

Removed the BrowsableAPIUnicdeRenderer class and added the control chars check into the base BrowsableAPIRenderer class

Browse Source
This commit is contained in:
Ben Lapid 2013-04-14 01:14:59 +03:00
parent 94c9e82f4f
commit 8f4f7c3ed2
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
rest_framework/renderers.py
View File

@ -26,6 +26,9 @@ from rest_framework.utils import encoders
from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.utils.breadcrumbs import get_breadcrumbs
from rest_framework import exceptions, parsers, status, VERSION from rest_framework import exceptions, parsers, status, VERSION
import re
control_chars = ''.join(map(unichr, range(0,32) + range(127,160)))
control_char_re = re.compile('[%s]' % re.escape(control_chars))
class BaseRenderer(object): class BaseRenderer(object):
""" """
@ -320,7 +323,9 @@ class BrowsableAPIRenderer(BaseRenderer):
renderer_context['indent'] = 4 renderer_context['indent'] = 4
content = renderer.render(data, accepted_media_type, renderer_context) content = renderer.render(data, accepted_media_type, renderer_context)
if not all(char in string.printable for char in content): if type(content) == unicode and control_char_re.match(content):
return '[%d bytes of binary content]'
if type(content) == str and not all(char in string.printable for char in content):
return '[%d bytes of binary content]' return '[%d bytes of binary content]'
return content return content
@ -520,31 +525,5 @@ class BrowsableAPIRenderer(BaseRenderer):
return ret return ret
import re
all_chars = (unichr(i) for i in xrange(0x110000))
control_chars = ''.join(map(unichr, range(0,32) + range(127,160)))
control_char_re = re.compile('[%s]' % re.escape(control_chars))
class BrowsableAPIUnicodeRenderer(BrowsableAPIRenderer):
def get_content(self, renderer, data,
accepted_media_type, renderer_context):
"""
Get the content as if it had been rendered by the default
non-documenting renderer.
"""
if not renderer:
return '[No renderers were found]'
renderer_context['indent'] = 4
content = renderer.render(data, accepted_media_type, renderer_context)
if not not control_char_re.match(content):
return '[%d bytes of binary content]'
return content
class UnicodeJSONRenderer(BaseRenderer): class UnicodeJSONRenderer(BaseRenderer):
ensure_ascii = False ensure_ascii = False