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
7537bf93
Commit
7537bf93
authored
Jun 08, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #922 from mindlace-mp/master
Set args and kwargs before initializing the request.
parents
75e3cbc9
d89aade3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
4 deletions
+19
-4
rest_framework/routers.py
+2
-1
rest_framework/tests/test_routers.py
+15
-1
rest_framework/views.py
+2
-2
No files found.
rest_framework/routers.py
View file @
7537bf93
...
...
@@ -215,6 +215,7 @@ class DefaultRouter(SimpleRouter):
"""
include_root_view
=
True
include_format_suffixes
=
True
root_view_name
=
'api-root'
def
get_api_root_view
(
self
):
"""
...
...
@@ -244,7 +245,7 @@ class DefaultRouter(SimpleRouter):
urls
=
[]
if
self
.
include_root_view
:
root_url
=
url
(
r'^$'
,
self
.
get_api_root_view
(),
name
=
'api-root'
)
root_url
=
url
(
r'^$'
,
self
.
get_api_root_view
(),
name
=
self
.
root_view_name
)
urls
.
append
(
root_url
)
default_urls
=
super
(
DefaultRouter
,
self
)
.
get_urls
()
...
...
rest_framework/tests/test_routers.py
View file @
7537bf93
...
...
@@ -6,7 +6,7 @@ from rest_framework import serializers, viewsets
from
rest_framework.compat
import
include
,
patterns
,
url
from
rest_framework.decorators
import
link
,
action
from
rest_framework.response
import
Response
from
rest_framework.routers
import
SimpleRouter
from
rest_framework.routers
import
SimpleRouter
,
DefaultRouter
factory
=
RequestFactory
()
...
...
@@ -148,3 +148,17 @@ class TestTrailingSlash(TestCase):
expected
=
[
'^notes$'
,
'^notes/(?P<pk>[^/]+)$'
]
for
idx
in
range
(
len
(
expected
)):
self
.
assertEqual
(
expected
[
idx
],
self
.
urls
[
idx
]
.
regex
.
pattern
)
class
TestNameableRoot
(
TestCase
):
def
setUp
(
self
):
class
NoteViewSet
(
viewsets
.
ModelViewSet
):
model
=
RouterTestModel
self
.
router
=
DefaultRouter
()
self
.
router
.
root_view_name
=
'nameable-root'
self
.
router
.
register
(
r'notes'
,
NoteViewSet
)
self
.
urls
=
self
.
router
.
urls
def
test_router_has_custom_name
(
self
):
expected
=
'nameable-root'
self
.
assertEqual
(
expected
,
self
.
urls
[
0
]
.
name
)
rest_framework/views.py
View file @
7537bf93
...
...
@@ -304,10 +304,10 @@ class APIView(View):
`.dispatch()` is pretty much the same as Django's regular dispatch,
but with extra hooks for startup, finalize, and exception handling.
"""
request
=
self
.
initialize_request
(
request
,
*
args
,
**
kwargs
)
self
.
request
=
request
self
.
args
=
args
self
.
kwargs
=
kwargs
request
=
self
.
initialize_request
(
request
,
*
args
,
**
kwargs
)
self
.
request
=
request
self
.
headers
=
self
.
default_response_headers
# deprecate?
try
:
...
...
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