aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkotibold2011-06-26 01:38:56 +0200
committermarkotibold2011-06-26 01:38:56 +0200
commit8cab127c2a99ab027e981f3e9198b7c548f0aa46 (patch)
tree15cd8e640de25af828c0634e71b99242e4dfe7d5
parent9be3d38aa02ff2a64adc9cab60db05f37cbfe476 (diff)
downloaddjango-rest-framework-8cab127c2a99ab027e981f3e9198b7c548f0aa46.tar.bz2
some restyling and updated requirements.txt for yaml support
-rw-r--r--examples/permissionsexample/urls.py4
-rw-r--r--examples/permissionsexample/views.py6
-rw-r--r--examples/sandbox/views.py2
-rw-r--r--requirements.txt2
4 files changed, 8 insertions, 6 deletions
diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py
index c421c7cc..33cb9b5f 100644
--- a/examples/permissionsexample/urls.py
+++ b/examples/permissionsexample/urls.py
@@ -1,8 +1,8 @@
from django.conf.urls.defaults import patterns, url
-from permissionsexample.views import PermissionsExampleView, ThrottlingExampleView, LoggedinView
+from permissionsexample.views import PermissionsExampleView, ThrottlingExampleView, LoggedInExampleView
urlpatterns = patterns('',
url(r'^$', PermissionsExampleView.as_view(), name='permissions-example'),
url(r'^throttling$', ThrottlingExampleView.as_view(), name='throttled-resource'),
- url(r'^loggedin$', LoggedinView.as_view(), name='loggedin-resource'),
+ url(r'^loggedin$', LoggedInExampleView.as_view(), name='loggedin-resource'),
)
diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py
index ca456191..f95c2c84 100644
--- a/examples/permissionsexample/views.py
+++ b/examples/permissionsexample/views.py
@@ -29,8 +29,10 @@ class ThrottlingExampleView(View):
"""
return "Successful response to GET request because throttle is not yet active."
-class LoggedinView(View):
-
+class LoggedInExampleView(View):
+ """
+ You can login with **'test', 'test'.**
+ """
permissions = (IsAuthenticated, )
def get(self, request):
return 'Logged in or not?' \ No newline at end of file
diff --git a/examples/sandbox/views.py b/examples/sandbox/views.py
index f8d87a0b..29f2e3ce 100644
--- a/examples/sandbox/views.py
+++ b/examples/sandbox/views.py
@@ -22,7 +22,7 @@ class Sandbox(View):
4. A generic object store API.
5. A code highlighting API.
6. A blog posts and comments API.
- 7. A basic example using permissions. You can login with **'test', 'test'.**
+ 7. A basic example using permissions.
Please feel free to browse, create, edit and delete the resources in these examples."""
diff --git a/requirements.txt b/requirements.txt
index 7ae0ee45..7d5e6682 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@
Django==1.2.4
wsgiref==0.1.2
coverage==3.4
-
+yaml==3.10