encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-29 13:04:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't do an inverted if test.

Browse Source
This commit is contained in:
Tom Christie 2013-01-21 17:42:33 +00:00
parent 2c76212e54
commit 98bffa68e6
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rest_framework/urlpatterns.py
View File

@ -6,10 +6,20 @@ 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 # Set of included URL patterns
regex = urlpattern.regex.pattern
namespace = urlpattern.namespace
app_name = urlpattern.app_name
kwargs = urlpattern.default_kwargs
# Add in the included patterns, after applying the suffixes
patterns = apply_suffix_patterns(urlpattern.url_patterns,
suffix_pattern,
suffix_required)
ret.append(url(regex, include(patterns, namespace, app_name), kwargs))
# Form our complementing '.format' urlpattern else:
# Regular URL pattern
regex = urlpattern.regex.pattern.rstrip('$') + suffix_pattern regex = urlpattern.regex.pattern.rstrip('$') + suffix_pattern
view = urlpattern._callback or urlpattern._callback_str view = urlpattern._callback or urlpattern._callback_str
kwargs = urlpattern.default_args kwargs = urlpattern.default_args
@ -18,16 +28,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required):
if not suffix_required: if not suffix_required:
ret.append(urlpattern) ret.append(urlpattern)
ret.append(url(regex, view, kwargs, name)) ret.append(url(regex, view, kwargs, name))
else:
# Set of included URL patterns
regex = urlpattern.regex.pattern
namespace = urlpattern.namespace
app_name = urlpattern.app_name
kwargs = urlpattern.default_kwargs
patterns = apply_suffix_patterns(urlpattern.url_patterns,
suffix_pattern,
suffix_required)
ret.append(url(regex, include(patterns, namespace, app_name), kwargs))
return ret return ret