Skip to content

Commit 5e76305

Browse files
rffontenellehugovkarhadthedev
authored
[3.11] GH-103484: Fix redirected permanently URLs (GH-104001) (#104088)
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com> Co-authored-by: Oleg Iarygin <dralife@yandex.ru> Fix redirected permanently URLs (#104001)
1 parent 61f1fbd commit 5e76305

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+79
-61
lines changed

Doc/conf.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,29 @@
260260

261261
linkcheck_allowed_redirects = {
262262
# bpo-NNNN -> BPO -> GH Issues
263-
r'https://bugs.python.org/issue\?@action=redirect&bpo=\d+': 'https://github.com/python/cpython/issues/\d+',
263+
r'https://bugs.python.org/issue\?@action=redirect&bpo=\d+': r'https://github.com/python/cpython/issues/\d+',
264264
# GH-NNNN used to refer to pull requests
265-
r'https://github.com/python/cpython/issues/\d+': 'https://github.com/python/cpython/pull/\d+',
265+
r'https://github.com/python/cpython/issues/\d+': r'https://github.com/python/cpython/pull/\d+',
266266
# :source:`something` linking files in the repository
267-
r'https://github.com/python/cpython/tree/.*': 'https://github.com/python/cpython/blob/.*'
267+
r'https://github.com/python/cpython/tree/.*': 'https://github.com/python/cpython/blob/.*',
268+
# Intentional HTTP use at Misc/NEWS.d/3.5.0a1.rst
269+
r'http://www.python.org/$': 'https://www.python.org/$',
270+
# Used in license page, keep as is
271+
r'https://www.zope.org/': r'https://www.zope.dev/',
272+
# Microsoft's redirects to learn.microsoft.com
273+
r'https://msdn.microsoft.com/.*': 'https://learn.microsoft.com/.*',
274+
r'https://docs.microsoft.com/.*': 'https://learn.microsoft.com/.*',
275+
r'https://go.microsoft.com/fwlink/\?LinkID=\d+': 'https://learn.microsoft.com/.*',
276+
# Language redirects
277+
r'https://toml.io': 'https://toml.io/en/',
278+
r'https://www.redhat.com': 'https://www.redhat.com/en',
279+
# Other redirects
280+
r'https://www.boost.org/libs/.+': r'https://www.boost.org/doc/libs/\d_\d+_\d/.+',
281+
r'https://support.microsoft.com/en-us/help/\d+': 'https://support.microsoft.com/en-us/topic/.+',
282+
r'https://perf.wiki.kernel.org$': 'https://perf.wiki.kernel.org/index.php/Main_Page',
283+
r'https://www.sqlite.org': 'https://www.sqlite.org/index.html',
284+
r'https://mitpress.mit.edu/sicp$': 'https://mitpress.mit.edu/9780262510875/structure-and-interpretation-of-computer-programs/',
285+
r'https://www.python.org/psf/': 'https://www.python.org/psf-landing/',
268286
}
269287

270288
linkcheck_anchors_ignore = [

Doc/distutils/apiref.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ directories.
10211021

10221022
Files in *src* that begin with :file:`.nfs` are skipped (more information on
10231023
these files is available in answer D2 of the `NFS FAQ page
1024-
<http://nfs.sourceforge.net/#section_d>`_).
1024+
<https://nfs.sourceforge.net/#section_d>`_).
10251025

10261026
.. versionchanged:: 3.3.1
10271027
NFS files are ignored.

Doc/distutils/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,4 +337,4 @@ loads its values::
337337
.. % \section{Putting it all together}
338338
339339
340-
.. _docutils: http://docutils.sourceforge.net
340+
.. _docutils: https://docutils.sourceforge.io

Doc/distutils/setupscript.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ Notes:
642642

643643
'long string'
644644
Multiple lines of plain text in reStructuredText format (see
645-
http://docutils.sourceforge.net/).
645+
https://docutils.sourceforge.io/).
646646

647647
'list of strings'
648648
See below.

Doc/faq/extending.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ on what you're trying to do.
4242
.. XXX make sure these all work
4343
4444
`Cython <https://cython.org>`_ and its relative `Pyrex
45-
<https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/>`_ are compilers
45+
<https://www.csse.canterbury.ac.nz/greg.ewing/python/Pyrex/>`_ are compilers
4646
that accept a slightly modified form of Python and generate the corresponding
4747
C code. Cython and Pyrex make it possible to write an extension without having
4848
to learn Python's C API.

Doc/faq/general.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ commercial use, to sell copies of Python in source or binary form (modified or
5454
unmodified), or to sell products that incorporate Python in some form. We would
5555
still like to know about all commercial use of Python, of course.
5656

57-
See `the PSF license page <https://www.python.org/psf/license/>`_ to find further
58-
explanations and a link to the full text of the license.
57+
See `the license page <https://docs.python.org/3/license.html>`_ to find further
58+
explanations and the full text of the PSF License.
5959

6060
The Python logo is trademarked, and in certain cases permission is required to
6161
use it. Consult `the Trademark Usage Policy
@@ -215,7 +215,7 @@ every day, and Usenet readers are often more able to cope with this volume.
215215
Announcements of new software releases and events can be found in
216216
comp.lang.python.announce, a low-traffic moderated list that receives about five
217217
postings per day. It's available as `the python-announce mailing list
218-
<https://mail.python.org/mailman/listinfo/python-announce-list>`_.
218+
<https://mail.python.org/mailman3/lists/python-announce-list.python.org/>`_.
219219

220220
More info about other mailing lists and newsgroups
221221
can be found at https://www.python.org/community/lists/.
@@ -352,7 +352,7 @@ titled "Python X.Y Release Schedule", where X.Y is a version that hasn't been
352352
publicly released yet.
353353

354354
New development is discussed on `the python-dev mailing list
355-
<https://mail.python.org/mailman/listinfo/python-dev/>`_.
355+
<https://mail.python.org/mailman3/lists/python-dev.python.org/>`_.
356356

357357

358358
Is it reasonable to propose incompatible changes to Python?

Doc/faq/programming.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Yes.
6161
`Pyflakes <https://github.com/PyCQA/pyflakes>`_ do basic checking that will
6262
help you catch bugs sooner.
6363

64-
Static type checkers such as `Mypy <http://mypy-lang.org/>`_,
64+
Static type checkers such as `Mypy <https://mypy-lang.org/>`_,
6565
`Pyre <https://pyre-check.org/>`_, and
6666
`Pytype <https://github.com/google/pytype>`_ can check type hints in Python
6767
source code.

Doc/howto/pyporting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ to make sure everything functions as expected in both versions of Python.
438438
.. _Futurize: https://python-future.org/automatic_conversion.html
439439
.. _importlib2: https://pypi.org/project/importlib2
440440
.. _Modernize: https://python-modernize.readthedocs.io/
441-
.. _mypy: http://mypy-lang.org/
441+
.. _mypy: https://mypy-lang.org/
442442
.. _Porting to Python 3: http://python3porting.com/
443443
.. _Pylint: https://pypi.org/project/pylint
444444

Doc/library/asyncio-eventloop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ Opening network connections
515515
specifies requirements for algorithms that reduce this user-visible
516516
delay and provides an algorithm.
517517

518-
For more information: https://tools.ietf.org/html/rfc6555
518+
For more information: https://datatracker.ietf.org/doc/html/rfc6555
519519

520520
.. versionchanged:: 3.11
521521

Doc/library/hashlib.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ Constructor functions also accept the following tree hashing parameters:
438438
:alt: Explanation of tree mode parameters.
439439

440440
See section 2.10 in `BLAKE2 specification
441-
<https://blake2.net/blake2_20130129.pdf>`_ for comprehensive review of tree
441+
<https://www.blake2.net/blake2_20130129.pdf>`_ for comprehensive review of tree
442442
hashing.
443443

444444

@@ -624,7 +624,7 @@ on the hash function used in digital signatures.
624624
by the signer.
625625

626626
(`NIST SP-800-106 "Randomized Hashing for Digital Signatures"
627-
<https://csrc.nist.gov/publications/detail/sp/800-106/final>`_)
627+
<https://csrc.nist.gov/publications/detail/sp/800-106/archive/2009-02-25>`_)
628628

629629
In BLAKE2 the salt is processed as a one-time input to the hash function during
630630
initialization, rather than as an input to each compression function.
@@ -633,7 +633,7 @@ initialization, rather than as an input to each compression function.
633633

634634
*Salted hashing* (or just hashing) with BLAKE2 or any other general-purpose
635635
cryptographic hash function, such as SHA-256, is not suitable for hashing
636-
passwords. See `BLAKE2 FAQ <https://blake2.net/#qa>`_ for more
636+
passwords. See `BLAKE2 FAQ <https://www.blake2.net/#qa>`_ for more
637637
information.
638638
..
639639
@@ -769,9 +769,9 @@ Domain Dedication 1.0 Universal:
769769

770770
* *Alexandr Sokolovskiy*
771771

772-
.. _BLAKE2: https://blake2.net
772+
.. _BLAKE2: https://www.blake2.net
773773
.. _HMAC: https://en.wikipedia.org/wiki/Hash-based_message_authentication_code
774-
.. _BLAKE: https://131002.net/blake/
774+
.. _BLAKE: https://web.archive.org/web/20200918190133/https://131002.net/blake/
775775
.. _SHA-3: https://en.wikipedia.org/wiki/NIST_hash_function_competition
776776
.. _ChaCha: https://cr.yp.to/chacha.html
777777
.. _pyblake2: https://pythonhosted.org/pyblake2/
@@ -787,7 +787,7 @@ Domain Dedication 1.0 Universal:
787787
Module :mod:`base64`
788788
Another way to encode binary hashes for non-binary environments.
789789

790-
https://blake2.net
790+
https://www.blake2.net
791791
Official BLAKE2 website.
792792

793793
https://csrc.nist.gov/csrc/media/publications/fips/180/2/archive/2002-08-01/documents/fips180-2.pdf

0 commit comments

Comments
 (0)