Deprecate urlize_quoted_links in favor of Django's built-in urlize

tomchristie · tomchristie · commit 4121b01b9126 · 2020-09-30T09:15:46.000+01:00
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
@@ -8,7 +8,7 @@
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.11.1'
+__version__ = '3.11.2'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 3-Clause'
 __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
@@ -418,7 +418,7 @@ def get_content(self, renderer, data,
         if render_style == 'binary':
             return '[%d bytes of binary content]' % len(content)
 
-        return content
+        return content.decode('utf-8') if isinstance(content, bytes) else content
 
     def show_form_for_method(self, view, method, request, obj):
         """
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
@@ -77,7 +77,7 @@
 
           <div class="region"  aria-label="{% trans "request form" %}">
           {% block request_forms %}
-          
+
           {% if 'GET' in allowed_methods %}
             <form id="get-form" class="pull-right">
               <fieldset>
@@ -176,9 +176,9 @@ <h1>{{ name }}</h1>
 
               <div class="response-info" aria-label="{% trans "response info" %}">
                 <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% for key, val in response_headers|items %}
-<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize_quoted_links }}</span>{% endfor %}
+<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize }}</span>{% endfor %}
 
-</span>{{ content|urlize_quoted_links }}</pre>
+</span>{{ content|urlize }}</pre>
               </div>
             </div>
 
