From 028851bfa1ee44b8e92808b18d32278d4a473cc8 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 27 Apr 2011 18:07:28 +0100
Subject: Fix up tests and examples after refactoring

---
 examples/mixin/urls.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'examples/mixin/urls.py')

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
index 05009284..96b630e3 100644
--- a/examples/mixin/urls.py
+++ b/examples/mixin/urls.py
@@ -1,12 +1,13 @@
 from djangorestframework.compat import View  # Use Django 1.3's django.views.generic.View, or fall back to a clone of that if Django < 1.3 
-from djangorestframework.emitters import EmitterMixin, DEFAULT_EMITTERS
+from djangorestframework.mixins import ResponseMixin
+from djangorestframework.emitters import DEFAULT_EMITTERS
 from djangorestframework.response import Response
 
 from django.conf.urls.defaults import patterns, url
 from django.core.urlresolvers import reverse
 
 
-class ExampleView(EmitterMixin, View):
+class ExampleView(ResponseMixin, View):
     """An example view using Django 1.3's class based views.
     Uses djangorestframework's EmitterMixin to provide support for multiple output formats."""
     emitters = DEFAULT_EMITTERS
-- 
cgit v1.2.3


From 93aa065fa92f64472a3ee80564020a81776be742 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 28 Apr 2011 19:54:30 +0100
Subject: emitters -> renderers

---
 examples/mixin/urls.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples/mixin/urls.py')

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
index 96b630e3..f4300f41 100644
--- a/examples/mixin/urls.py
+++ b/examples/mixin/urls.py
@@ -1,6 +1,6 @@
 from djangorestframework.compat import View  # Use Django 1.3's django.views.generic.View, or fall back to a clone of that if Django < 1.3 
 from djangorestframework.mixins import ResponseMixin
-from djangorestframework.emitters import DEFAULT_EMITTERS
+from djangorestframework.renderers import DEFAULT_RENDERERS
 from djangorestframework.response import Response
 
 from django.conf.urls.defaults import patterns, url
@@ -9,8 +9,8 @@ from django.core.urlresolvers import reverse
 
 class ExampleView(ResponseMixin, View):
     """An example view using Django 1.3's class based views.
-    Uses djangorestframework's EmitterMixin to provide support for multiple output formats."""
-    emitters = DEFAULT_EMITTERS
+    Uses djangorestframework's RendererMixin to provide support for multiple output formats."""
+    renderers = DEFAULT_RENDERERS
 
     def get(self, request):
         response = Response(200, {'description': 'Some example content',
-- 
cgit v1.2.3


From 8756664e064a18afc4713d921c318cd968f18433 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 2 May 2011 19:49:12 +0100
Subject: emitters -> renderers

---
 examples/mixin/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/mixin/urls.py')

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
index f4300f41..1d25f6c7 100644
--- a/examples/mixin/urls.py
+++ b/examples/mixin/urls.py
@@ -15,7 +15,7 @@ class ExampleView(ResponseMixin, View):
     def get(self, request):
         response = Response(200, {'description': 'Some example content',
                                   'url': reverse('mixin-view')})
-        return self.emit(response)
+        return self.render(response)
 
 
 urlpatterns = patterns('',
-- 
cgit v1.2.3