From 2cdff1b01e3aca6c56cef433e786e3ae75362739 Mon Sep 17 00:00:00 2001 From: Sébastien Piquemal Date: Tue, 7 Feb 2012 16:52:15 +0200 Subject: modified examples, somethin' still broken, can't find what --- examples/mixin/urls.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/mixin') diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py index a3da3b2c..6e9e497e 100644 --- a/examples/mixin/urls.py +++ b/examples/mixin/urls.py @@ -10,12 +10,12 @@ from django.core.urlresolvers import reverse class ExampleView(ResponseMixin, View): """An example view using Django 1.3's class based views. Uses djangorestframework's RendererMixin to provide support for multiple output formats.""" - renderers = DEFAULT_RENDERERS + renderer_classes = DEFAULT_RENDERERS def get(self, request): - response = Response(200, {'description': 'Some example content', - 'url': reverse('mixin-view')}) - return self.render(response) + response = Response({'description': 'Some example content', + 'url': reverse('mixin-view')}, status=200) + return self.prepare_response(response) urlpatterns = patterns('', -- cgit v1.2.3 From b33579a7a18c2cbc6e3789d4a7dc78c82fb0fe80 Mon Sep 17 00:00:00 2001 From: Sébastien Piquemal Date: Fri, 10 Feb 2012 11:05:20 +0200 Subject: attempt at fixing the examples --- examples/mixin/urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples/mixin') diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py index 6e9e497e..58cf370c 100644 --- a/examples/mixin/urls.py +++ b/examples/mixin/urls.py @@ -15,7 +15,8 @@ class ExampleView(ResponseMixin, View): def get(self, request): response = Response({'description': 'Some example content', 'url': reverse('mixin-view')}, status=200) - return self.prepare_response(response) + self.response = self.prepare_response(response) + return self.response urlpatterns = patterns('', -- cgit v1.2.3 From af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 21 Feb 2012 20:12:14 +0000 Subject: Merging master into develop --- examples/mixin/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/mixin') diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py index 58cf370c..c899467b 100644 --- a/examples/mixin/urls.py +++ b/examples/mixin/urls.py @@ -2,9 +2,9 @@ from djangorestframework.compat import View # Use Django 1.3's django.views.gen from djangorestframework.mixins import ResponseMixin from djangorestframework.renderers import DEFAULT_RENDERERS from djangorestframework.response import Response +from djangorestframework.utils import reverse from django.conf.urls.defaults import patterns, url -from django.core.urlresolvers import reverse class ExampleView(ResponseMixin, View): @@ -14,7 +14,7 @@ class ExampleView(ResponseMixin, View): def get(self, request): response = Response({'description': 'Some example content', - 'url': reverse('mixin-view')}, status=200) + 'url': reverse('mixin-view', request)}, status=200) self.response = self.prepare_response(response) return self.response -- cgit v1.2.3 From 5fd4c639d7c64572dd07dc31dcd627bed9469b05 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 21 Feb 2012 20:57:36 +0000 Subject: Merge master into develop --- examples/mixin/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/mixin') diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py index c899467b..102f2c12 100644 --- a/examples/mixin/urls.py +++ b/examples/mixin/urls.py @@ -2,7 +2,7 @@ from djangorestframework.compat import View # Use Django 1.3's django.views.gen from djangorestframework.mixins import ResponseMixin from djangorestframework.renderers import DEFAULT_RENDERERS from djangorestframework.response import Response -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from django.conf.urls.defaults import patterns, url -- cgit v1.2.3 From 1cde31c86d9423e9b7a7409c2ef2ba7c0500e47f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 25 Feb 2012 18:45:17 +0000 Subject: Massive merge --- examples/mixin/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/mixin') diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py index 102f2c12..7a5697fd 100644 --- a/examples/mixin/urls.py +++ b/examples/mixin/urls.py @@ -10,11 +10,12 @@ from django.conf.urls.defaults import patterns, url class ExampleView(ResponseMixin, View): """An example view using Django 1.3's class based views. Uses djangorestframework's RendererMixin to provide support for multiple output formats.""" - renderer_classes = DEFAULT_RENDERERS + renderers = DEFAULT_RENDERERS def get(self, request): + url = reverse('mixin-view', request) response = Response({'description': 'Some example content', - 'url': reverse('mixin-view', request)}, status=200) + 'url': url}, status=200) self.response = self.prepare_response(response) return self.response @@ -22,4 +23,3 @@ class ExampleView(ResponseMixin, View): urlpatterns = patterns('', url(r'^$', ExampleView.as_view(), name='mixin-view'), ) - -- cgit v1.2.3 From eea2aa04378d27d79e7aba12ce95c697148bd57e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 29 Aug 2012 19:54:38 +0100 Subject: Remove examples (to be moved to a seperate project) --- examples/mixin/__init__.py | 0 examples/mixin/urls.py | 25 ------------------------- 2 files changed, 25 deletions(-) delete mode 100644 examples/mixin/__init__.py delete mode 100644 examples/mixin/urls.py (limited to 'examples/mixin') diff --git a/examples/mixin/__init__.py b/examples/mixin/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py deleted file mode 100644 index 900c532e..00000000 --- a/examples/mixin/urls.py +++ /dev/null @@ -1,25 +0,0 @@ -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.renderers import DEFAULT_RENDERERS -from djangorestframework.response import Response -from djangorestframework.reverse import reverse - -from django.conf.urls.defaults import patterns, url - - -class ExampleView(ResponseMixin, View): - """An example view using Django 1.3's class based views. - Uses djangorestframework's RendererMixin to provide support for multiple - output formats.""" - renderers = DEFAULT_RENDERERS - - def get(self, request): - url = reverse('mixin-view', request=request) - response = Response(200, {'description': 'Some example content', - 'url': url}) - return self.render(response) - - -urlpatterns = patterns('', - url(r'^$', ExampleView.as_view(), name='mixin-view'), -) -- cgit v1.2.3