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/resourceexample/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/resourceexample') diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py index e6b5eeb8..44c4176a 100644 --- a/examples/resourceexample/views.py +++ b/examples/resourceexample/views.py @@ -16,12 +16,12 @@ class ExampleView(View): """ Handle GET requests, returning a list of URLs pointing to 3 other views. """ - return {"Some other resources": [reverse('another-example', kwargs={'num':num}) for num in range(3)]} + return Response({"Some other resources": [reverse('another-example', kwargs={'num':num}) for num in range(3)]}) class AnotherExampleView(View): """ - A basic view, that can be handle GET and POST requests. + A basic view, that can handle GET and POST requests. Applies some simple form validation on POST requests. """ form = MyForm @@ -33,7 +33,7 @@ class AnotherExampleView(View): """ if int(num) > 2: return Response(status.HTTP_404_NOT_FOUND) - return "GET request to AnotherExampleResource %s" % num + return Response("GET request to AnotherExampleResource %s" % num) def post(self, request, num): """ @@ -42,4 +42,4 @@ class AnotherExampleView(View): """ if int(num) > 2: return Response(status.HTTP_404_NOT_FOUND) - return "POST request to AnotherExampleResource %s, with content: %s" % (num, repr(self.CONTENT)) + return Response("POST request to AnotherExampleResource %s, with content: %s" % (num, repr(self.CONTENT))) -- 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/resourceexample/views.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'examples/resourceexample') diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py index 44c4176a..f2a7a08a 100644 --- a/examples/resourceexample/views.py +++ b/examples/resourceexample/views.py @@ -1,5 +1,4 @@ -from django.core.urlresolvers import reverse - +from djangorestframework.utils import reverse from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework import status @@ -14,9 +13,12 @@ class ExampleView(View): def get(self, request): """ - Handle GET requests, returning a list of URLs pointing to 3 other views. + Handle GET requests, returning a list of URLs pointing to + three other views. """ - return Response({"Some other resources": [reverse('another-example', kwargs={'num':num}) for num in range(3)]}) + urls = [reverse('another-example', request, kwargs={'num': num}) + for num in range(3)] + return Response({"Some other resources": urls}) class AnotherExampleView(View): @@ -32,7 +34,7 @@ class AnotherExampleView(View): Returns a simple string indicating which view the GET request was for. """ if int(num) > 2: - return Response(status.HTTP_404_NOT_FOUND) + return Response(status=status.HTTP_404_NOT_FOUND) return Response("GET request to AnotherExampleResource %s" % num) def post(self, request, num): @@ -41,5 +43,5 @@ class AnotherExampleView(View): Returns a simple string indicating what content was supplied. """ if int(num) > 2: - return Response(status.HTTP_404_NOT_FOUND) + return Response(status=status.HTTP_404_NOT_FOUND) return Response("POST request to AnotherExampleResource %s, with content: %s" % (num, repr(self.CONTENT))) -- 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/resourceexample/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/resourceexample') diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py index f2a7a08a..8e7be302 100644 --- a/examples/resourceexample/views.py +++ b/examples/resourceexample/views.py @@ -1,4 +1,4 @@ -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework import status -- 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/resourceexample/forms.py | 1 + examples/resourceexample/views.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'examples/resourceexample') diff --git a/examples/resourceexample/forms.py b/examples/resourceexample/forms.py index aa6e7685..d21d601a 100644 --- a/examples/resourceexample/forms.py +++ b/examples/resourceexample/forms.py @@ -1,5 +1,6 @@ from django import forms + class MyForm(forms.Form): foo = forms.BooleanField(required=False) bar = forms.IntegerField(help_text='Must be an integer.') diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py index 8e7be302..41a3111c 100644 --- a/examples/resourceexample/views.py +++ b/examples/resourceexample/views.py @@ -16,9 +16,11 @@ class ExampleView(View): Handle GET requests, returning a list of URLs pointing to three other views. """ - urls = [reverse('another-example', request, kwargs={'num': num}) - for num in range(3)] - return Response({"Some other resources": urls}) + resource_urls = [reverse('another-example', + kwargs={'num': num}, + request=request) + for num in range(3)] + return Response({"Some other resources": resource_urls}) class AnotherExampleView(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/resourceexample/__init__.py | 0 examples/resourceexample/forms.py | 7 ------ examples/resourceexample/urls.py | 7 ------ examples/resourceexample/views.py | 49 ------------------------------------ 4 files changed, 63 deletions(-) delete mode 100644 examples/resourceexample/__init__.py delete mode 100644 examples/resourceexample/forms.py delete mode 100644 examples/resourceexample/urls.py delete mode 100644 examples/resourceexample/views.py (limited to 'examples/resourceexample') diff --git a/examples/resourceexample/__init__.py b/examples/resourceexample/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/resourceexample/forms.py b/examples/resourceexample/forms.py deleted file mode 100644 index d21d601a..00000000 --- a/examples/resourceexample/forms.py +++ /dev/null @@ -1,7 +0,0 @@ -from django import forms - - -class MyForm(forms.Form): - foo = forms.BooleanField(required=False) - bar = forms.IntegerField(help_text='Must be an integer.') - baz = forms.CharField(max_length=32, help_text='Free text. Max length 32 chars.') diff --git a/examples/resourceexample/urls.py b/examples/resourceexample/urls.py deleted file mode 100644 index 6e141f3c..00000000 --- a/examples/resourceexample/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.conf.urls.defaults import patterns, url -from resourceexample.views import ExampleView, AnotherExampleView - -urlpatterns = patterns('', - url(r'^$', ExampleView.as_view(), name='example-resource'), - url(r'^(?P[0-9]+)/$', AnotherExampleView.as_view(), name='another-example'), -) diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py deleted file mode 100644 index 41a3111c..00000000 --- a/examples/resourceexample/views.py +++ /dev/null @@ -1,49 +0,0 @@ -from djangorestframework.reverse import reverse -from djangorestframework.views import View -from djangorestframework.response import Response -from djangorestframework import status - -from resourceexample.forms import MyForm - - -class ExampleView(View): - """ - A basic read-only view that points to 3 other views. - """ - - def get(self, request): - """ - Handle GET requests, returning a list of URLs pointing to - three other views. - """ - resource_urls = [reverse('another-example', - kwargs={'num': num}, - request=request) - for num in range(3)] - return Response({"Some other resources": resource_urls}) - - -class AnotherExampleView(View): - """ - A basic view, that can handle GET and POST requests. - Applies some simple form validation on POST requests. - """ - form = MyForm - - def get(self, request, num): - """ - Handle GET requests. - Returns a simple string indicating which view the GET request was for. - """ - if int(num) > 2: - return Response(status=status.HTTP_404_NOT_FOUND) - return Response("GET request to AnotherExampleResource %s" % num) - - def post(self, request, num): - """ - Handle POST requests, with form validation. - Returns a simple string indicating what content was supplied. - """ - if int(num) > 2: - return Response(status=status.HTTP_404_NOT_FOUND) - return Response("POST request to AnotherExampleResource %s, with content: %s" % (num, repr(self.CONTENT))) -- cgit v1.2.3