Fixes to get tests to pass after updating vendored packages.

awx/main/urls.py

@@ -162,48 +162,3 @@ urlpatterns = patterns('awx.main.views',
     url(r'^$', 'api_root_view'),
     url(r'^v1/', include(v1_urls)),
 )
-
-# Monkeypatch get_view_name and get_view_description in Django REST Framework
-# 2.3.x to allow a custom view name or description to be defined on the view
-# class, instead of always using __name__ and __doc__.  Used to be possible in
-# 2.2.x by defining get_name() and get_description() methods on a view.
-
-try:
-    import rest_framework.utils.formatting
-    from django.utils.safestring import mark_safe
-
-    original_get_view_name = rest_framework.utils.formatting.get_view_name
-    def get_view_name(cls, suffix=None):
-        name = ''
-        # Support for get_name method on views compatible with 2.2.x. 
-        if hasattr(cls, 'get_name') and callable(cls.get_name):
-            name = cls().get_name()
-        elif hasattr(cls, 'view_name'):
-            if callable(cls.view_name):
-                name = cls.view_name()
-            else:
-                name = cls.view_name
-        if name:
-            return ('%s %s' % (name, suffix)) if suffix else name
-        return original_get_view_name(cls, suffix=None)
-    rest_framework.utils.formatting.get_view_name = get_view_name
-
-    original_get_view_description = rest_framework.utils.formatting.get_view_description
-    def get_view_description(cls, html=False):
-        # Support for get_description method on views compatible with 2.2.x. 
-        if hasattr(cls, 'get_description') and callable(cls.get_description):
-            desc = cls().get_description(html=html)
-            cls = type(cls.__name__, (object,), {'__doc__': desc})
-        elif hasattr(cls, 'view_description'):
-            if callable(cls.view_description):
-                view_desc = cls.view_description()
-            else:
-                view_desc = cls.view_description
-            cls = type(cls.__name__, (object,), {'__doc__': view_desc})
-        desc = original_get_view_description(cls, html=html)
-        if html:
-            desc = '<div class="description">%s</div>' % desc
-        return mark_safe(desc)
-    rest_framework.utils.formatting.get_view_description = get_view_description
-except ImportError:
-    pass