Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
c7e7279d
Commit
c7e7279d
authored
Feb 20, 2012
by
Daniel Izquierdo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update examples to use the new custom `reverse()'
This fixes #167 except for the docs
parent
b600b507
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
27 deletions
+25
-27
examples/blogpost/resources.py
+3
-3
examples/blogpost/tests.py
+1
-2
examples/mixin/urls.py
+2
-2
examples/objectstore/views.py
+3
-3
examples/permissionsexample/views.py
+3
-3
examples/pygments_api/views.py
+3
-3
examples/resourceexample/views.py
+2
-3
examples/sandbox/views.py
+8
-8
No files found.
examples/blogpost/resources.py
View file @
c7e7279d
from
django.core.urlresolvers
import
reverse
from
djangorestframework.resources
import
ModelResource
from
djangorestframework.resources
import
ModelResource
from
djangorestframework.utils
import
reverse
from
blogpost.models
import
BlogPost
,
Comment
from
blogpost.models
import
BlogPost
,
Comment
...
@@ -12,7 +12,7 @@ class BlogPostResource(ModelResource):
...
@@ -12,7 +12,7 @@ class BlogPostResource(ModelResource):
ordering
=
(
'-created'
,)
ordering
=
(
'-created'
,)
def
comments
(
self
,
instance
):
def
comments
(
self
,
instance
):
return
reverse
(
'comments'
,
kwargs
=
{
'blogpost'
:
instance
.
key
})
return
reverse
(
'comments'
,
request
,
kwargs
=
{
'blogpost'
:
instance
.
key
})
class
CommentResource
(
ModelResource
):
class
CommentResource
(
ModelResource
):
...
@@ -24,4 +24,4 @@ class CommentResource(ModelResource):
...
@@ -24,4 +24,4 @@ class CommentResource(ModelResource):
ordering
=
(
'-created'
,)
ordering
=
(
'-created'
,)
def
blogpost
(
self
,
instance
):
def
blogpost
(
self
,
instance
):
return
reverse
(
'blog-post'
,
kwargs
=
{
'key'
:
instance
.
blogpost
.
key
})
return
reverse
(
'blog-post'
,
request
,
kwargs
=
{
'key'
:
instance
.
blogpost
.
key
})
examples/blogpost/tests.py
View file @
c7e7279d
"""Test a range of REST API usage of the example application.
"""Test a range of REST API usage of the example application.
"""
"""
from
django.core.urlresolvers
import
reverse
from
django.test
import
TestCase
from
django.test
import
TestCase
from
django.core.urlresolvers
import
reverse
from
django.utils
import
simplejson
as
json
from
django.utils
import
simplejson
as
json
from
djangorestframework.compat
import
RequestFactory
from
djangorestframework.compat
import
RequestFactory
from
djangorestframework.utils
import
reverse
from
djangorestframework.views
import
InstanceModelView
,
ListOrCreateModelView
from
djangorestframework.views
import
InstanceModelView
,
ListOrCreateModelView
from
blogpost
import
models
,
urls
from
blogpost
import
models
,
urls
...
...
examples/mixin/urls.py
View file @
c7e7279d
...
@@ -2,9 +2,9 @@ from djangorestframework.compat import View # Use Django 1.3's django.views.gen
...
@@ -2,9 +2,9 @@ from djangorestframework.compat import View # Use Django 1.3's django.views.gen
from
djangorestframework.mixins
import
ResponseMixin
from
djangorestframework.mixins
import
ResponseMixin
from
djangorestframework.renderers
import
DEFAULT_RENDERERS
from
djangorestframework.renderers
import
DEFAULT_RENDERERS
from
djangorestframework.response
import
Response
from
djangorestframework.response
import
Response
from
djangorestframework.utils
import
reverse
from
django.conf.urls.defaults
import
patterns
,
url
from
django.conf.urls.defaults
import
patterns
,
url
from
django.core.urlresolvers
import
reverse
class
ExampleView
(
ResponseMixin
,
View
):
class
ExampleView
(
ResponseMixin
,
View
):
...
@@ -14,7 +14,7 @@ class ExampleView(ResponseMixin, View):
...
@@ -14,7 +14,7 @@ class ExampleView(ResponseMixin, View):
def
get
(
self
,
request
):
def
get
(
self
,
request
):
response
=
Response
(
200
,
{
'description'
:
'Some example content'
,
response
=
Response
(
200
,
{
'description'
:
'Some example content'
,
'url'
:
reverse
(
'mixin-view'
)})
'url'
:
reverse
(
'mixin-view'
,
request
)})
return
self
.
render
(
response
)
return
self
.
render
(
response
)
...
...
examples/objectstore/views.py
View file @
c7e7279d
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.urlresolvers
import
reverse
from
djangorestframework.utils
import
reverse
from
djangorestframework.views
import
View
from
djangorestframework.views
import
View
from
djangorestframework.response
import
Response
from
djangorestframework.response
import
Response
from
djangorestframework
import
status
from
djangorestframework
import
status
...
@@ -41,7 +41,7 @@ class ObjectStoreRoot(View):
...
@@ -41,7 +41,7 @@ class ObjectStoreRoot(View):
filepaths
=
[
os
.
path
.
join
(
OBJECT_STORE_DIR
,
file
)
for
file
in
os
.
listdir
(
OBJECT_STORE_DIR
)
if
not
file
.
startswith
(
'.'
)]
filepaths
=
[
os
.
path
.
join
(
OBJECT_STORE_DIR
,
file
)
for
file
in
os
.
listdir
(
OBJECT_STORE_DIR
)
if
not
file
.
startswith
(
'.'
)]
ctime_sorted_basenames
=
[
item
[
0
]
for
item
in
sorted
([(
os
.
path
.
basename
(
path
),
os
.
path
.
getctime
(
path
))
for
path
in
filepaths
],
ctime_sorted_basenames
=
[
item
[
0
]
for
item
in
sorted
([(
os
.
path
.
basename
(
path
),
os
.
path
.
getctime
(
path
))
for
path
in
filepaths
],
key
=
operator
.
itemgetter
(
1
),
reverse
=
True
)]
key
=
operator
.
itemgetter
(
1
),
reverse
=
True
)]
return
[
reverse
(
'stored-object'
,
kwargs
=
{
'key'
:
key
})
for
key
in
ctime_sorted_basenames
]
return
[
reverse
(
'stored-object'
,
request
,
kwargs
=
{
'key'
:
key
})
for
key
in
ctime_sorted_basenames
]
def
post
(
self
,
request
):
def
post
(
self
,
request
):
"""
"""
...
@@ -51,7 +51,7 @@ class ObjectStoreRoot(View):
...
@@ -51,7 +51,7 @@ class ObjectStoreRoot(View):
pathname
=
os
.
path
.
join
(
OBJECT_STORE_DIR
,
key
)
pathname
=
os
.
path
.
join
(
OBJECT_STORE_DIR
,
key
)
pickle
.
dump
(
self
.
CONTENT
,
open
(
pathname
,
'wb'
))
pickle
.
dump
(
self
.
CONTENT
,
open
(
pathname
,
'wb'
))
remove_oldest_files
(
OBJECT_STORE_DIR
,
MAX_FILES
)
remove_oldest_files
(
OBJECT_STORE_DIR
,
MAX_FILES
)
return
Response
(
status
.
HTTP_201_CREATED
,
self
.
CONTENT
,
{
'Location'
:
reverse
(
'stored-object'
,
kwargs
=
{
'key'
:
key
})})
return
Response
(
status
.
HTTP_201_CREATED
,
self
.
CONTENT
,
{
'Location'
:
reverse
(
'stored-object'
,
request
,
kwargs
=
{
'key'
:
key
})})
class
StoredObject
(
View
):
class
StoredObject
(
View
):
...
...
examples/permissionsexample/views.py
View file @
c7e7279d
from
djangorestframework.views
import
View
from
djangorestframework.views
import
View
from
djangorestframework.permissions
import
PerUserThrottling
,
IsAuthenticated
from
djangorestframework.permissions
import
PerUserThrottling
,
IsAuthenticated
from
django
.core.urlresolver
s
import
reverse
from
django
restframework.util
s
import
reverse
class
PermissionsExampleView
(
View
):
class
PermissionsExampleView
(
View
):
...
@@ -12,11 +12,11 @@ class PermissionsExampleView(View):
...
@@ -12,11 +12,11 @@ class PermissionsExampleView(View):
return
[
return
[
{
{
'name'
:
'Throttling Example'
,
'name'
:
'Throttling Example'
,
'url'
:
reverse
(
'throttled-resource'
)
'url'
:
reverse
(
'throttled-resource'
,
request
)
},
},
{
{
'name'
:
'Logged in example'
,
'name'
:
'Logged in example'
,
'url'
:
reverse
(
'loggedin-resource'
)
'url'
:
reverse
(
'loggedin-resource'
,
request
)
},
},
]
]
...
...
examples/pygments_api/views.py
View file @
c7e7279d
from
__future__
import
with_statement
# for python 2.5
from
__future__
import
with_statement
# for python 2.5
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.urlresolvers
import
reverse
from
djangorestframework.resources
import
FormResource
from
djangorestframework.resources
import
FormResource
from
djangorestframework.response
import
Response
from
djangorestframework.response
import
Response
from
djangorestframework.renderers
import
BaseRenderer
from
djangorestframework.renderers
import
BaseRenderer
from
djangorestframework.utils
import
reverse
from
djangorestframework.views
import
View
from
djangorestframework.views
import
View
from
djangorestframework
import
status
from
djangorestframework
import
status
...
@@ -61,7 +61,7 @@ class PygmentsRoot(View):
...
@@ -61,7 +61,7 @@ class PygmentsRoot(View):
Return a list of all currently existing snippets.
Return a list of all currently existing snippets.
"""
"""
unique_ids
=
[
os
.
path
.
split
(
f
)[
1
]
for
f
in
list_dir_sorted_by_ctime
(
HIGHLIGHTED_CODE_DIR
)]
unique_ids
=
[
os
.
path
.
split
(
f
)[
1
]
for
f
in
list_dir_sorted_by_ctime
(
HIGHLIGHTED_CODE_DIR
)]
return
[
reverse
(
'pygments-instance'
,
args
=
[
unique_id
])
for
unique_id
in
unique_ids
]
return
[
reverse
(
'pygments-instance'
,
request
,
args
=
[
unique_id
])
for
unique_id
in
unique_ids
]
def
post
(
self
,
request
):
def
post
(
self
,
request
):
"""
"""
...
@@ -81,7 +81,7 @@ class PygmentsRoot(View):
...
@@ -81,7 +81,7 @@ class PygmentsRoot(View):
remove_oldest_files
(
HIGHLIGHTED_CODE_DIR
,
MAX_FILES
)
remove_oldest_files
(
HIGHLIGHTED_CODE_DIR
,
MAX_FILES
)
return
Response
(
status
.
HTTP_201_CREATED
,
headers
=
{
'Location'
:
reverse
(
'pygments-instance'
,
args
=
[
unique_id
])})
return
Response
(
status
.
HTTP_201_CREATED
,
headers
=
{
'Location'
:
reverse
(
'pygments-instance'
,
request
,
args
=
[
unique_id
])})
class
PygmentsInstance
(
View
):
class
PygmentsInstance
(
View
):
...
...
examples/resourceexample/views.py
View file @
c7e7279d
from
django.core.urlresolvers
import
reverse
from
djangorestframework.utils
import
reverse
from
djangorestframework.views
import
View
from
djangorestframework.views
import
View
from
djangorestframework.response
import
Response
from
djangorestframework.response
import
Response
from
djangorestframework
import
status
from
djangorestframework
import
status
...
@@ -16,7 +15,7 @@ class ExampleView(View):
...
@@ -16,7 +15,7 @@ class ExampleView(View):
"""
"""
Handle GET requests, returning a list of URLs pointing to 3 other views.
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
{
"Some other resources"
:
[
reverse
(
'another-example'
,
request
,
kwargs
=
{
'num'
:
num
})
for
num
in
range
(
3
)]}
class
AnotherExampleView
(
View
):
class
AnotherExampleView
(
View
):
...
...
examples/sandbox/views.py
View file @
c7e7279d
"""The root view for the examples provided with Django REST framework"""
"""The root view for the examples provided with Django REST framework"""
from
django
.core.urlresolver
s
import
reverse
from
django
restframework.util
s
import
reverse
from
djangorestframework.views
import
View
from
djangorestframework.views
import
View
...
@@ -27,11 +27,11 @@ class Sandbox(View):
...
@@ -27,11 +27,11 @@ class Sandbox(View):
Please feel free to browse, create, edit and delete the resources in these examples."""
Please feel free to browse, create, edit and delete the resources in these examples."""
def
get
(
self
,
request
):
def
get
(
self
,
request
):
return
[{
'name'
:
'Simple Resource example'
,
'url'
:
reverse
(
'example-resource'
)},
return
[{
'name'
:
'Simple Resource example'
,
'url'
:
reverse
(
'example-resource'
,
request
)},
{
'name'
:
'Simple ModelResource example'
,
'url'
:
reverse
(
'model-resource-root'
)},
{
'name'
:
'Simple ModelResource example'
,
'url'
:
reverse
(
'model-resource-root'
,
request
)},
{
'name'
:
'Simple Mixin-only example'
,
'url'
:
reverse
(
'mixin-view'
)},
{
'name'
:
'Simple Mixin-only example'
,
'url'
:
reverse
(
'mixin-view'
,
request
)},
{
'name'
:
'Object store API'
,
'url'
:
reverse
(
'object-store-root'
)},
{
'name'
:
'Object store API'
,
'url'
:
reverse
(
'object-store-root'
,
request
)},
{
'name'
:
'Code highlighting API'
,
'url'
:
reverse
(
'pygments-root'
)},
{
'name'
:
'Code highlighting API'
,
'url'
:
reverse
(
'pygments-root'
,
request
)},
{
'name'
:
'Blog posts API'
,
'url'
:
reverse
(
'blog-posts-root'
)},
{
'name'
:
'Blog posts API'
,
'url'
:
reverse
(
'blog-posts-root'
,
request
)},
{
'name'
:
'Permissions example'
,
'url'
:
reverse
(
'permissions-example'
)}
{
'name'
:
'Permissions example'
,
'url'
:
reverse
(
'permissions-example'
,
request
)}
]
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment