Commit 0ad017a5 by 이동환

requested changes

parent 973860d9
...@@ -35,7 +35,10 @@ DynamicDetailRoute = namedtuple('DynamicDetailRoute', ['url', 'name', 'initkwarg ...@@ -35,7 +35,10 @@ DynamicDetailRoute = namedtuple('DynamicDetailRoute', ['url', 'name', 'initkwarg
DynamicListRoute = namedtuple('DynamicListRoute', ['url', 'name', 'initkwargs']) DynamicListRoute = namedtuple('DynamicListRoute', ['url', 'name', 'initkwargs'])
def replace_curly_brackets(url_path): def escape_curly_brackets(url_path):
"""
Double brackets in regex of url_path for escape string formatting
"""
if ('{' and '}') in url_path: if ('{' and '}') in url_path:
url_path = url_path.replace('{', '{{').replace('}', '}}') url_path = url_path.replace('{', '{{').replace('}', '}}')
return url_path return url_path
...@@ -184,7 +187,7 @@ class SimpleRouter(BaseRouter): ...@@ -184,7 +187,7 @@ class SimpleRouter(BaseRouter):
initkwargs = route.initkwargs.copy() initkwargs = route.initkwargs.copy()
initkwargs.update(method_kwargs) initkwargs.update(method_kwargs)
url_path = initkwargs.pop("url_path", None) or methodname url_path = initkwargs.pop("url_path", None) or methodname
url_path = replace_curly_brackets(url_path) url_path = escape_curly_brackets(url_path)
url_name = initkwargs.pop("url_name", None) or url_path url_name = initkwargs.pop("url_name", None) or url_path
ret.append(Route( ret.append(Route(
url=replace_methodname(route.url, url_path), url=replace_methodname(route.url, url_path),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment