From 3bb1556820fef0576da0c02241fd7cadc0b682ff Mon Sep 17 00:00:00 2001 From: Artem Homenko Date: Mon, 6 Feb 2017 15:20:08 +0200 Subject: [PATCH] Resolve merge conflict --- rest_framework/routers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 027a78cc1..18616f67d 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -252,6 +252,14 @@ class SimpleRouter(BaseRouter): lookup=lookup, trailing_slash=self.trailing_slash ) + + # If there is no prefix, the first part of the url is probably + # controlled by project's urls.py and the router is in an app, + # so a slash in the beginning will (A) cause Django to give + # warnings and (B) generate URLS that will require using '//'. + if not prefix and regex[:2] == '^/': + regex = '^' + regex[2:] + view = viewset.as_view(mapping, **route.initkwargs) name = route.name.format(basename=basename) ret.append(url(regex, view, name=name))