Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix url dispatcher index when variable is preceded by a fixed string after a slash #8566

Merged
merged 5 commits into from
Aug 1, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Jul 31, 2024

What do these changes do?

Fix url dispatcher index when variable is preceded by a fixed string after a slash. We need to strip off the fixed string when creating the index key so we can match against the path at that part of the url.

Are there changes in behavior for the user?

Bugfix for a regression in 3.10.x. Regressed in #7829 fixes #8567

Is it a substantial burden for the maintainers to support this?

no

@bdraco bdraco added this to the 3.10.1 milestone Jul 31, 2024
@bdraco bdraco added the backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot label Jul 31, 2024
@bdraco
Copy link
Member Author

bdraco commented Jul 31, 2024

This was reported to me out of band. An issue report is forthcoming tomorrow.

@bdraco
Copy link
Member Author

bdraco commented Jul 31, 2024

Will finish this up once I get confirmation from the reporter and an issue report

Copy link

codecov bot commented Jul 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.69%. Comparing base (7ffb847) to head (068b976).
Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8566   +/-   ##
=======================================
  Coverage   97.68%   97.69%           
=======================================
  Files         107      107           
  Lines       33403    33421   +18     
  Branches     3923     3924    +1     
=======================================
+ Hits        32631    32649   +18     
  Misses        559      559           
  Partials      213      213           
Flag Coverage Δ
CI-GHA 97.60% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.25% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.64% <100.00%> (+<0.01%) ⬆️
OS-macOS 96.92% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.06% <100.00%> (-0.01%) ⬇️
Py-3.10.14 97.00% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.23% <100.00%> (+<0.01%) ⬆️
Py-3.12.4 97.36% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.40% <100.00%> (+<0.01%) ⬆️
Py-3.8.18 96.89% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.05% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.00% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 96.57% <100.00%> (-0.01%) ⬇️
VM-macos 96.92% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.25% <100.00%> (+<0.01%) ⬆️
VM-windows 95.64% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@CoMPaTech
Copy link

As indicated can confirm that both test (via gist) and CI for module building (manually patching within respective venvs works)

Copy link

@CoMPaTech CoMPaTech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (and tnx @bdraco)

@bdraco
Copy link
Member Author

bdraco commented Aug 1, 2024

Thanks for testing

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 1, 2024
@bdraco bdraco added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Aug 1, 2024
@bdraco bdraco marked this pull request as ready for review August 1, 2024 15:28
@bdraco bdraco merged commit f3a1afc into master Aug 1, 2024
39 of 40 checks passed
@bdraco bdraco deleted the greedy_match branch August 1, 2024 16:55
Copy link
Contributor

patchback bot commented Aug 1, 2024

Backport to 3.10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.10/f3a1afc51665d9d2180606f250f492a61623ac6b/pr-8566

Backported as #8578

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Aug 1, 2024

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/f3a1afc51665d9d2180606f250f492a61623ac6b/pr-8566

Backported as #8579

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Aug 1, 2024
bdraco pushed a commit that referenced this pull request Aug 1, 2024
…able is preceded by a fixed string after a slash (#8578)

Co-authored-by: J. Nick Koston <nick@koston.org>
fix for a regression in 3.10.x. Regressed in #7829 fixes #8567
bdraco pushed a commit that referenced this pull request Aug 1, 2024
…able is preceded by a fixed string after a slash (#8579)

Co-authored-by: J. Nick Koston <nick@koston.org>
fix for a regression in 3.10.x. Regressed in #7829 fixes #8567
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Matching tail pattern in add_route/add_* handling not working as expected in 3.10.0
3 participants