encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 19:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/nested-routers' into nested-routers

Browse Source 
Conflicts:
	rest_framework/routers.py
This commit is contained in:
Alan Justino 2013-08-26 19:02:45 -03:00
commit a4e4b31bb6
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/routers.py
View File

@ -189,9 +189,6 @@ class SimpleRouter(BaseRouter):
Given a viewset, return the portion of URL regex that is used
to match against a single instance.
"""
if lookup_prefix:
lookup_prefix += '_'
base_regex = '(?P<{lookup_prefix}{lookup_field}>[^/]+)'
lookup_field = getattr(viewset, 'lookup_field', 'pk')
return base_regex.format(lookup_field=lookup_field, lookup_prefix=lookup_prefix)