Merge pull request #2601 from k4nar/refactor_simplerouter

Remove duplicated code in routers.SimpleRouter

rest_framework/routers.py

@@ -165,11 +165,9 @@ class SimpleRouter(BaseRouter):
                 else:
                     list_routes.append((httpmethods, methodname))
 
+        def _get_dynamic_routes(route, dynamic_routes):
             ret = []
-        for route in self.routes:
-            if isinstance(route, DynamicDetailRoute):
-                # Dynamic detail routes (@detail_route decorator)
-                for httpmethods, methodname in detail_routes:
+            for httpmethods, methodname in dynamic_routes:
                 method_kwargs = getattr(viewset, methodname).kwargs
                 initkwargs = route.initkwargs.copy()
                 initkwargs.update(method_kwargs)
@@ -180,19 +178,17 @@ class SimpleRouter(BaseRouter):
                     name=replace_methodname(route.name, url_path),
                     initkwargs=initkwargs,
                 ))
+
+            return ret
+
+        ret = []
+        for route in self.routes:
+            if isinstance(route, DynamicDetailRoute):
+                # Dynamic detail routes (@detail_route decorator)
+                ret += _get_dynamic_routes(route, detail_routes)
             elif isinstance(route, DynamicListRoute):
                 # Dynamic list routes (@list_route decorator)
-                for httpmethods, methodname in list_routes:
-                    method_kwargs = getattr(viewset, methodname).kwargs
-                    initkwargs = route.initkwargs.copy()
-                    initkwargs.update(method_kwargs)
-                    url_path = initkwargs.pop("url_path", None) or methodname
-                    ret.append(Route(
-                        url=replace_methodname(route.url, url_path),
-                        mapping=dict((httpmethod, methodname) for httpmethod in httpmethods),
-                        name=replace_methodname(route.name, url_path),
-                        initkwargs=initkwargs,
-                    ))
+                ret += _get_dynamic_routes(route, list_routes)
             else:
                 # Standard route
                 ret.append(route)