Support redirects from non-padded PEP numbers #2421
Next
Next commit
PRS: Support redirects
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
- Loading branch information
commit eead2f7c813cd49a68ca9d94840bc76d0f007374
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,44 @@ | ||||||
| {# 404 Not Found: Redirect typos and link to PEP 0 #} | ||||||
| <!DOCTYPE html> | ||||||
| <html lang="en"> | ||||||
| <head> | ||||||
| <meta charset="utf-8" /> | ||||||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||||||
| <meta name="color-scheme" content="light dark" /> | ||||||
| <title>PEP Not Found | peps.python.org</title> | ||||||
| <link rel="shortcut icon" href="{{ pathto('_static/py.png', resource=True) }}"/> | ||||||
| <link rel="stylesheet" href="{{ pathto('_static/style.css', resource=True) }}" type="text/css" /> | ||||||
| <link rel="stylesheet" href="{{ pathto('_static/mq.css', resource=True) }}" type="text/css" /> | ||||||
| <link rel="stylesheet" href="{{ pathto('_static/dark.css', resource=True) }}" type="text/css" media="(prefers-color-scheme: dark)" id="css-dark"/> | ||||||
| <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,400;0,700;1,400&display=swap" rel="stylesheet"> | ||||||
| <meta name="description" content="Python Enhancement Proposals (PEPs)"/> | ||||||
| <script> | ||||||
| const pepNumMatch = window.location.pathname.match(/^\d+$/) | ||||||
| if (pepNumMatch !== null) { | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. Our comments crossed over, sorry!
A |
||||||
| const pepNum = pepNumMatch[0] | ||||||
| window.location.pathname = "/pep-" + pepNum.padStart(4, "0") | ||||||
| } | ||||||
| </script> | ||||||
| </head> | ||||||
| <body> | ||||||
| <section id="pep-page-section"> | ||||||
| <header> | ||||||
| <h1>Python Enhancement Proposals</h1> | ||||||
| <ul class="breadcrumbs"> | ||||||
| <li><a href="https://www.python.org/" title="The Python Programming Language">Python</a> » </li> | ||||||
| <li><a href="{{ pathto("pep-0000") }}">PEP Index</a></li> | ||||||
ezio-melotti marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| </ul> | ||||||
| <button onClick="toggleColourScheme()"></button> | ||||||
| </header> | ||||||
| <article> | ||||||
| <section id="pep-content"> | ||||||
| <h1 class="page-title">PEP Not Found</h1> | ||||||
| <p>There is no PEP at this address.</p> | ||||||
| <p>Please return to <a href="{{ pathto("pep-0000") }}">the index</a>.</p> | ||||||
| </section> | ||||||
| </article> | ||||||
| <nav id="pep-sidebar"></nav> | ||||||
| </section> | ||||||
| <script src="{{ pathto('_static/colour_scheme.js', resource=True) }}"></script> | ||||||
| </body> | ||||||
| </html> | ||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With
^and$in the regex, it won't matchpep-NNN. Did you just change this temporarily to test?Note that in the suggestion below I used
match[0]because of this change, but if my previous suggestion is restored it should bematch[1].There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From above, "I don't want to include the
pep-prefix for the auto-redirects"A
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not?
If we set the autolinking to
https://peps.python.org/pep-<num>/and<num>is a valid 4-digits number (e.g. pep-0008), then it will go straight to the right page. If we omit thepep-prefix, then it will have to go through an extra redirect if JS is enabled, or end up at the 404 page if JS is disabled.In case of a valid PEP with a <4 digits number (e.g. pep-8) it will go to
/pep-8/and get redirected to/pep-0008.In case of an invalid PEP with a <4 digits number (e.g. pep-123) it will go to
/pep-123/, get redirected to/pep-0123, and then stop at the 404 page since the PEP doesn't exist and the id is already 4 digits long.Am I missing something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The autolinking on this repo is currently set to link to
https://python.org/dev/peps/pep-<num>. My suggestion that simply matchedpep-(\d+)works even with this type of URL, but fails with/^\d+$/.