Fix list_route, detail_route with kwargs contains curly bracket in url_path #5187
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
no-dap
changed the title
tomchristie
reviewed
May 29, 2017
rest_framework/routers.py
Outdated
| def replace_curly_brackets(url_path): | ||
| if ('{' and '}') in url_path: | ||
| url_path = url_path.replace('{', '{{').replace('}', '}}') | ||
| return url_path |
There was a problem hiding this comment.
Won't this also end up breaking the regex?
There was a problem hiding this comment.
Error raised at here in routers.py, 258L
regex = route.url.format(
prefix=prefix,
lookup=lookup,
trailing_slash=self.trailing_slash
)
Actually, this escaping is not for regex, for formatting string.
I also check that this replace makes well-routed url with inserted kwargs in url_path in my testcase.
There was a problem hiding this comment.
Okay, I think this is valid enough, yup, tho let's make a couple of minor tweaks:
escape_curly_bracketswould be slightly more clear.- Let's include a docstring noting that we escape any brackets in the regex for the purposes of string formatting.
|
Thanks! |
7 tasks
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
refs : #5172
before: #5177
when list_route and detail_route's url_path contains curly brackets, it raise IndexError
as we can see at #5172.
added test code ensure that when I escape curly bracket it works fine.
I think list_route and detail_route need url_path with regex lookup for making restful url
unless we can use nested route on list_route and detail_route.