Merge branch 'version-3-5' into rejig-schema-generation

rest_framework/schemas.py

@@ -206,31 +206,6 @@ def has_view_permissions(self, view):
             return False
         return True
 
-    def setup_view(self, callback, method, request):
-        """
-        Setup a view instance.
-        """
-        view = callback.cls()
-        for attr, val in getattr(callback, 'initkwargs', {}).items():
-            setattr(view, attr, val)
-        view.args = ()
-        view.kwargs = {}
-        view.format_kwarg = None
-
-        actions = getattr(callback, 'actions', None)
-        if actions is not None:
-            if method == 'OPTIONS':
-                view.action = 'metadata'
-            else:
-                view.action = actions.get(method.lower())
-
-        if request is not None:
-            view.request = clone_request(request, method)
-        else:
-            view.request = None
-
-        return view
-
     # Methods for generating each individual `Link` instance...
 
     def get_link(self, path, method, view):
@@ -355,7 +330,7 @@ def get_filter_fields(self, path, method, view):
             fields += as_query_fields(filter_backend().get_fields(view))
         return fields
 
-    # Methods for generating the keys which are used to layout each link.
+    # Methods for generating the link layout....
 
     default_mapping = {
         'get': 'read',

tests/test_schemas.py

@@ -215,7 +215,7 @@ def test_view(self):
                 }
             }
         )
-        self.assertEquals(schema, expected)
+        self.assertEqual(schema, expected)
 
 
 class SnippetListView(APIView):