Fix PATH_PARAMETER_PATTERN for DRF default value pattern. #468
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
Django REST Framework will use `[^/.]+` as the default value pattern in certain cases, e.g. `(?P<pk>[^/.]+)`, which doesn't work well with the current regular expression in `PATH_PARAMETER_PATTERN`. ``` ❯ git describe; git rev-parse HEAD 3.14.0-69-g0618fa88 0618fa88e1a8c2cf8a2aab29ef6de66b49e5f7ed ❯ git grep -n '\[^/.\]+' rest_framework/routers.py:143: self._default_value_pattern = '[^/.]+' tests/test_routers.py:304: expected = ['^notes/$', '^notes/(?P<pk>[^/.]+)/$'] tests/test_routers.py:319: expected = ['^notes$', '^notes/(?P<pk>[^/.]+)$'] ``` The fix inserts `(?:[^/]*?\[\^[^/]*/)?` before the final `[^/]*` in the pattern. This allows matching a slash inside an inverted character set, i.e. `[^...]`, treating it as part of the named group.
Codecov Report
@@ Coverage Diff @@
## master #468 +/- ##
==========================================
+ Coverage 93.15% 93.30% +0.15%
==========================================
Files 103 103
Lines 2630 2630
Branches 229 229
==========================================
+ Hits 2450 2454 +4
+ Misses 138 136 -2
+ Partials 42 40 -2
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
p1c2u
reviewed
Jan 20, 2023
|
@ngnpope thank you for the contribution |
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.
Suggestion cannot be applied right now. Please check back later.
Django REST Framework will use
[^/.]+as the default value pattern in certain cases, e.g.(?P<pk>[^/.]+), which doesn't work well with the current regular expression inPATH_PARAMETER_PATTERN.The fix inserts
(?:[^/]*?\[\^[^/]*/)?before the final[^/]*in the pattern. This allows matching a slash inside an inverted character set, i.e.[^...], treating it as part of the named group.