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
98bffa68
Commit
98bffa68
authored
Jan 21, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't do an inverted if test.
parent
2c76212e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
13 deletions
+14
-13
rest_framework/urlpatterns.py
+14
-13
No files found.
rest_framework/urlpatterns.py
View file @
98bffa68
...
@@ -6,28 +6,29 @@ from django.core.urlresolvers import RegexURLResolver
...
@@ -6,28 +6,29 @@ from django.core.urlresolvers import RegexURLResolver
def
apply_suffix_patterns
(
urlpatterns
,
suffix_pattern
,
suffix_required
):
def
apply_suffix_patterns
(
urlpatterns
,
suffix_pattern
,
suffix_required
):
ret
=
[]
ret
=
[]
for
urlpattern
in
urlpatterns
:
for
urlpattern
in
urlpatterns
:
if
not
isinstance
(
urlpattern
,
RegexURLResolver
):
if
isinstance
(
urlpattern
,
RegexURLResolver
):
# Regular URL pattern
# Form our complementing '.format' urlpattern
regex
=
urlpattern
.
regex
.
pattern
.
rstrip
(
'$'
)
+
suffix_pattern
view
=
urlpattern
.
_callback
or
urlpattern
.
_callback_str
kwargs
=
urlpattern
.
default_args
name
=
urlpattern
.
name
# Add in both the existing and the new urlpattern
if
not
suffix_required
:
ret
.
append
(
urlpattern
)
ret
.
append
(
url
(
regex
,
view
,
kwargs
,
name
))
else
:
# Set of included URL patterns
# Set of included URL patterns
regex
=
urlpattern
.
regex
.
pattern
regex
=
urlpattern
.
regex
.
pattern
namespace
=
urlpattern
.
namespace
namespace
=
urlpattern
.
namespace
app_name
=
urlpattern
.
app_name
app_name
=
urlpattern
.
app_name
kwargs
=
urlpattern
.
default_kwargs
kwargs
=
urlpattern
.
default_kwargs
# Add in the included patterns, after applying the suffixes
patterns
=
apply_suffix_patterns
(
urlpattern
.
url_patterns
,
patterns
=
apply_suffix_patterns
(
urlpattern
.
url_patterns
,
suffix_pattern
,
suffix_pattern
,
suffix_required
)
suffix_required
)
ret
.
append
(
url
(
regex
,
include
(
patterns
,
namespace
,
app_name
),
kwargs
))
ret
.
append
(
url
(
regex
,
include
(
patterns
,
namespace
,
app_name
),
kwargs
))
else
:
# Regular URL pattern
regex
=
urlpattern
.
regex
.
pattern
.
rstrip
(
'$'
)
+
suffix_pattern
view
=
urlpattern
.
_callback
or
urlpattern
.
_callback_str
kwargs
=
urlpattern
.
default_args
name
=
urlpattern
.
name
# Add in both the existing and the new urlpattern
if
not
suffix_required
:
ret
.
append
(
urlpattern
)
ret
.
append
(
url
(
regex
,
view
,
kwargs
,
name
))
return
ret
return
ret
...
...
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