encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-07 22:04:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 486a8f82b2 into 9b56dda918

Browse Source
This commit is contained in:
David Sutherland 2016-05-22 15:23:29 +00:00
commit b6f581f89a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/urlpatterns.py
View File

@ -23,7 +23,10 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required):
else:
# Regular URL pattern
regex = urlpattern.regex.pattern.rstrip('$').rstrip('/') + suffix_pattern
regex = urlpattern.regex.pattern.rstrip('$')
if regex[-1:] == '/':
regex += '?'
regex += suffix_pattern
view = urlpattern._callback or urlpattern._callback_str
kwargs = urlpattern.default_args
name = urlpattern.name

2
tests/test_urlpatterns.py
View File

@ -47,7 +47,7 @@ class FormatSuffixTests(TestCase):
test_paths = [
(URLTestPath('/test.api', (), {'format': 'api'}), True),
(URLTestPath('/test/.api', (), {'format': 'api'}), False),
(URLTestPath('/test/.api', (), {'format': 'api'}), True),
(URLTestPath('/test.api/', (), {'format': 'api'}), True),
]