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

Don't consume .json style suffixes with routers.

Browse Source 
When trailing slash is false, the lookup regex should not consume '.'
characters.  Fixes #1057.
This commit is contained in:
Tom Christie 2013-08-23 14:58:06 +01:00
parent f54fc3a76b
commit 005f475c6a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/routers.py
View File

@ -189,7 +189,11 @@ class SimpleRouter(BaseRouter):
Given a viewset, return the portion of URL regex that is used
to match against a single instance.
"""
base_regex = '(?P<{lookup_field}>[^/]+)'
if self.trailing_slash:
base_regex = '(?P<{lookup_field}>[^/]+)'
else:
# Don't consume `.json` style suffixes
base_regex = '(?P<{lookup_field}>[^/.]+)'
lookup_field = getattr(viewset, 'lookup_field', 'pk')
return base_regex.format(lookup_field=lookup_field)