Fix non existent URI s #19793
Merged
Fix non existent URI s #19793
Conversation
This file contains hidden or 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
|
I think(?) the correct fix is more something like diff --git i/doc/sphinxext/redirect_from.py w/doc/sphinxext/redirect_from.py
index ff3826056..01ab484ce 100644
--- i/doc/sphinxext/redirect_from.py
+++ w/doc/sphinxext/redirect_from.py
@@ -65,8 +65,7 @@ class RedirectFrom(Directive):
raise ValueError(
f"{redirected_reldoc} is already noted as redirecting to "
f"{self.redirects[redirected_reldoc]}")
- self.redirects[redirected_reldoc] = builder.get_relative_uri(
- redirected_reldoc, current_doc)
+ self.redirects[redirected_reldoc] = current_doc
return []
@@ -76,7 +75,7 @@ def _generate_redirects(app, exception):
return
for k, v in RedirectFrom.redirects.items():
p = Path(app.outdir, k + builder.out_suffix)
- html = HTML_TEMPLATE.format(v=v)
+ html = HTML_TEMPLATE.format(v=builder.get_relative_uri(k, v))
if p.is_file():
if p.read_text() != html:
logger.warning(f'A redirect-from directive is trying to 'so that e.g. |
aa98720 to
9168a84
Compare
anntzer
approved these changes
Mar 28, 2021
timhoffm
approved these changes
Mar 28, 2021
|
Something went wrong ... Please have a look at my logs. |
|
@meeseeksdev backport to v3.4.x |
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Mar 29, 2021
QuLogic
added a commit
that referenced
this pull request
Mar 30, 2021
…793-on-v3.4.x Backport PR #19793 on branch v3.4.x (Fix non existent URI s)
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.
PR Summary
Fixes #19780. @anntzer actually wrote the code, so perhaps he has a more elegant solution...
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).