diff options
| author | Tom Christie | 2012-09-12 10:13:14 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-09-12 10:13:14 +0100 |
| commit | 2469cd2c837112cc8134bebc6d3ac34994529c78 (patch) | |
| tree | 04015170c444a01335be35a4b60011593cbee31d /djangorestframework/tests/renderers.py | |
| parent | c85f799ade0710dd27838e8bfc78989c80213d6a (diff) | |
| parent | 381fdd17a733d9e4279c43f30e7c0456eaef10c9 (diff) | |
| download | django-rest-framework-2469cd2c837112cc8134bebc6d3ac34994529c78.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'djangorestframework/tests/renderers.py')
| -rw-r--r-- | djangorestframework/tests/renderers.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py index 692243e6..718c903f 100644 --- a/djangorestframework/tests/renderers.py +++ b/djangorestframework/tests/renderers.py @@ -51,7 +51,7 @@ class RendererB(BaseRenderer): class MockView(APIView): - renderers = (RendererA, RendererB) + renderer_classes = (RendererA, RendererB) def get(self, request, **kwargs): response = Response(DUMMYCONTENT, status=DUMMYSTATUS) @@ -65,23 +65,23 @@ class MockGETView(APIView): class HTMLView(APIView): - renderers = (DocumentingHTMLRenderer, ) + renderer_classes = (DocumentingHTMLRenderer, ) def get(self, request, **kwargs): return Response('text') class HTMLView1(APIView): - renderers = (DocumentingHTMLRenderer, JSONRenderer) + renderer_classes = (DocumentingHTMLRenderer, JSONRenderer) def get(self, request, **kwargs): return Response('text') urlpatterns = patterns('', - url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderers=[RendererA, RendererB])), - url(r'^$', MockView.as_view(renderers=[RendererA, RendererB])), - url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderers=[JSONRenderer, JSONPRenderer])), - url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderers=[JSONPRenderer])), + url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), + url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])), + url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderer_classes=[JSONRenderer, JSONPRenderer])), + url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderer_classes=[JSONPRenderer])), url(r'^html$', HTMLView.as_view()), url(r'^html1$', HTMLView1.as_view()), url(r'^api', include('djangorestframework.urls', namespace='djangorestframework')) |