Rename HTMLTemplateRenderer -> HTMLRenderer, DocuemntingHTMLRenderer -> BrowseableAPIRenderer

6 files changed, 13 insertions, 14 deletions

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a776b0e2..25e6ed62 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -132,7 +132,7 @@ class YAMLRenderer(BaseRenderer):
         return yaml.safe_dump(data)
 
 
-class HTMLTemplateRenderer(BaseRenderer):
+class HTMLRenderer(BaseRenderer):
     """
     A Base class provided for convenience.
 
@@ -179,7 +179,7 @@ class HTMLTemplateRenderer(BaseRenderer):
         raise ConfigurationError('Returned a template response with no template_name')
 
 
-class DocumentingHTMLRenderer(BaseRenderer):
+class BrowsableAPIRenderer(BaseRenderer):
     """
     HTML renderer used to self-document the API.
     """
@@ -197,7 +197,7 @@ class DocumentingHTMLRenderer(BaseRenderer):
 
         # Find the first valid renderer and render the content. (Don't use another documenting renderer.)
         renderers = [renderer for renderer in view.renderer_classes
-                     if not issubclass(renderer, DocumentingHTMLRenderer)]
+                     if not issubclass(renderer, BrowsableAPIRenderer)]
         if not renderers:
             return '[No renderers were found]'
 
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index ccc8f368..4ee10155 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -24,7 +24,7 @@ from django.utils import importlib
 DEFAULTS = {
     'DEFAULT_RENDERERS': (
         'rest_framework.renderers.JSONRenderer',
-        'rest_framework.renderers.DocumentingHTMLRenderer',
+        'rest_framework.renderers.BrowsableAPIRenderer',
     ),
     'DEFAULT_PARSERS': (
         'rest_framework.parsers.JSONParser',
diff --git a/rest_framework/tests/htmlrenderer.py b/rest_framework/tests/htmlrenderer.py
index 7a7f2743..da2f83c3 100644
--- a/rest_framework/tests/htmlrenderer.py
+++ b/rest_framework/tests/htmlrenderer.py
@@ -3,12 +3,12 @@ from django.test import TestCase
 from django.template import TemplateDoesNotExist, Template
 import django.template.loader
 from rest_framework.decorators import api_view, renderer_classes
-from rest_framework.renderers import HTMLTemplateRenderer
+from rest_framework.renderers import HTMLRenderer
 from rest_framework.response import Response
 
 
 @api_view(('GET',))
-@renderer_classes((HTMLTemplateRenderer,))
+@renderer_classes((HTMLRenderer,))
 def example(request):
     """
     A view that can returns an HTML representation.
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py
index 91d84848..6de8f124 100644
--- a/rest_framework/tests/renderers.py
+++ b/rest_framework/tests/renderers.py
@@ -9,7 +9,7 @@ from rest_framework.compat import yaml
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \
-    XMLRenderer, JSONPRenderer, DocumentingHTMLRenderer
+    XMLRenderer, JSONPRenderer, BrowsableAPIRenderer
 from rest_framework.parsers import YAMLParser, XMLParser
 from rest_framework.settings import api_settings
 
@@ -68,14 +68,14 @@ class MockGETView(APIView):
 
 
 class HTMLView(APIView):
-    renderer_classes = (DocumentingHTMLRenderer, )
+    renderer_classes = (BrowsableAPIRenderer, )
 
     def get(self, request, **kwargs):
         return Response('text')
 
 
 class HTMLView1(APIView):
-    renderer_classes = (DocumentingHTMLRenderer, JSONRenderer)
+    renderer_classes = (BrowsableAPIRenderer, JSONRenderer)
 
     def get(self, request, **kwargs):
         return Response('text')
@@ -97,7 +97,7 @@ class POSTDeniedPermission(permissions.BasePermission):
 
 
 class POSTDeniedView(APIView):
-    renderer_classes = (DocumentingHTMLRenderer,)
+    renderer_classes = (BrowsableAPIRenderer,)
     permission_classes = (POSTDeniedPermission,)
 
     def get(self, request):
diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index f74e54fc..d1625b67 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -9,7 +9,7 @@ from rest_framework import status
 from rest_framework.renderers import (
     BaseRenderer,
     JSONRenderer,
-    DocumentingHTMLRenderer
+    BrowsableAPIRenderer
 )
 from rest_framework.settings import api_settings
 
@@ -53,14 +53,14 @@ class MockView(APIView):
 
 
 class HTMLView(APIView):
-    renderer_classes = (DocumentingHTMLRenderer, )
+    renderer_classes = (BrowsableAPIRenderer, )
 
     def get(self, request, **kwargs):
         return Response('text')
 
 
 class HTMLView1(APIView):
-    renderer_classes = (DocumentingHTMLRenderer, JSONRenderer)
+    renderer_classes = (BrowsableAPIRenderer, JSONRenderer)
 
     def get(self, request, **kwargs):
         return Response('text')
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 4454791b..256987ad 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,4 +1,3 @@
-import copy
 import datetime
 from django.test import TestCase
 from rest_framework import serializers