Skip to content

Commit 338cd83

Browse files
CuriousLearnervstinner
authored andcommitted
bpo-25910: Link redirections in docs (#1933)
Fixes some redirection links in docs.
1 parent 7464e87 commit 338cd83

37 files changed

+61
-63
lines changed

Doc/distributing/index.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Key terms
6262
locally.
6363

6464
.. _setuptools: https://setuptools.readthedocs.io/en/latest/
65-
.. _wheel: https://wheel.readthedocs.org
65+
.. _wheel: https://wheel.readthedocs.io/
6666

6767
Open source licensing and collaboration
6868
=======================================
@@ -111,7 +111,7 @@ by invoking the ``pip`` module at the command line::
111111
The Python Packaging User Guide includes more details on the `currently
112112
recommended tools`_.
113113

114-
.. _currently recommended tools: https://packaging.python.org/en/latest/current/#packaging-tool-recommendations
114+
.. _currently recommended tools: https://packaging.python.org/guides/tool-recommendations/#packaging-tool-recommendations
115115

116116
Reading the guide
117117
=================
@@ -124,11 +124,11 @@ involved in creating a project:
124124
* `Uploading the project to the Python Packaging Index`_
125125

126126
.. _Project structure: \
127-
https://packaging.python.org/en/latest/distributing/
127+
https://packaging.python.org/tutorials/distributing-packages/
128128
.. _Building and packaging the project: \
129-
https://packaging.python.org/en/latest/distributing/#packaging-your-project
129+
https://packaging.python.org/tutorials/distributing-packages/#packaging-your-project
130130
.. _Uploading the project to the Python Packaging Index: \
131-
https://packaging.python.org/en/latest/distributing/#uploading-your-project-to-pypi
131+
https://packaging.python.org/tutorials/distributing-packages/#uploading-your-project-to-pypi
132132

133133

134134
How do I...?
@@ -160,7 +160,7 @@ Python Packaging User Guide for more information and recommendations.
160160
.. seealso::
161161

162162
`Python Packaging User Guide: Binary Extensions
163-
<https://packaging.python.org/en/latest/extensions>`__
163+
<https://packaging.python.org/guides/packaging-binary-extensions/>`__
164164

165165
.. other topics:
166166

Doc/distutils/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ very little overhead for build/release/install mechanics.
2222
This guide only covers the basic tools for building and distributing
2323
extensions that are provided as part of this version of Python. Third party
2424
tools offer easier to use and more secure alternatives. Refer to the `quick
25-
recommendations section <https://packaging.python.org/en/latest/current/>`__
25+
recommendations section <https://packaging.python.org/guides/tool-recommendations/>`__
2626
in the Python Packaging User Guide for more information.
2727

2828
.. toctree::

Doc/distutils/setupscript.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ Notes:
625625

626626
(7)
627627
The valid classifiers are listed on
628-
`PyPI <http://pypi.python.org/pypi?:action=list_classifiers>`_.
628+
`PyPI <https://pypi.python.org/pypi?:action=list_classifiers>`_.
629629

630630
(8)
631631
To preserve backward compatibility, this field also accepts a string. If

Doc/extending/extending.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ your system setup; details are given in later chapters.
2727
avoid writing C extensions and preserve portability to other implementations.
2828
For example, if your use case is calling C library functions or system calls,
2929
you should consider using the :mod:`ctypes` module or the `cffi
30-
<https://cffi.readthedocs.org>`_ library rather than writing custom C code.
30+
<https://cffi.readthedocs.io/>`_ library rather than writing
31+
custom C code.
3132
These modules let you write Python code to interface with C code and are more
3233
portable between implementations of Python than writing and compiling a C
3334
extension module.

Doc/extending/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ approaches to creating C and C++ extensions for Python.
3232

3333
.. seealso::
3434

35-
`Python Packaging User Guide: Binary Extensions <https://packaging.python.org/en/latest/extensions/>`_
35+
`Python Packaging User Guide: Binary Extensions <https://packaging.python.org/guides/packaging-binary-extensions/>`_
3636
The Python Packaging User Guide not only covers several available
3737
tools that simplify the creation of binary extensions, but also
3838
discusses the various reasons why creating an extension module may be

Doc/faq/general.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ The Python project's infrastructure is located all over the world.
272272
`www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace
273273
<https://www.rackspace.com>`_, with CDN caching provided by `Fastly
274274
<https://www.fastly.com>`_. `Upfront Systems
275-
<http://www.upfrontsystems.co.za/>`_ hosts `bugs.python.org
275+
<http://www.upfrontsoftware.co.za>`_ hosts `bugs.python.org
276276
<https://bugs.python.org>`_. Many other Python services like `the Wiki
277277
<https://wiki.python.org>`_ are hosted by `Oregon State
278278
University Open Source Lab <https://osuosl.org>`_.

Doc/howto/logging.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ favourite beverage and carry on.
314314
If your logging needs are simple, then use the above examples to incorporate
315315
logging into your own scripts, and if you run into problems or don't
316316
understand something, please post a question on the comp.lang.python Usenet
317-
group (available at https://groups.google.com/group/comp.lang.python) and you
317+
group (available at https://groups.google.com/forum/#!forum/comp.lang.python) and you
318318
should receive help before too long.
319319

320320
Still here? You can carry on reading the next few sections, which provide a

Doc/howto/pyporting.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,12 @@ to make sure everything functions as expected in both versions of Python.
433433
.. _Futurize: http://python-future.org/automatic_conversion.html
434434
.. _importlib: https://docs.python.org/3/library/importlib.html#module-importlib
435435
.. _importlib2: https://pypi.python.org/pypi/importlib2
436-
.. _Modernize: https://python-modernize.readthedocs.org/en/latest/
436+
.. _Modernize: https://python-modernize.readthedocs.io/
437437
.. _mypy: http://mypy-lang.org/
438438
.. _Porting to Python 3: http://python3porting.com/
439439
.. _Pylint: https://pypi.python.org/pypi/pylint
440440

441-
.. _Python 3 Q & A: https://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions_and_answers.html
441+
.. _Python 3 Q & A: https://ncoghlan-devs-python-notes.readthedocs.io/en/latest/python3/questions_and_answers.html
442442

443443
.. _pytype: https://github.com/google/pytype
444444
.. _python-future: http://python-future.org/

Doc/howto/unicode.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ difficult reading. `A chronology <http://www.unicode.org/history/>`_ of the
214214
origin and development of Unicode is also available on the site.
215215

216216
To help understand the standard, Jukka Korpela has written `an introductory
217-
guide <https://www.cs.tut.fi/~jkorpela/unicode/guide.html>`_ to reading the
217+
guide <http://jkorpela.fi/unicode/guide.html>`_ to reading the
218218
Unicode character tables.
219219

220220
Another `good introductory article <https://www.joelonsoftware.com/2003/10/08/the-absolute-minimum-every-software-developer-absolutely-positively-must-know-about-unicode-and-character-sets-no-excuses/>`_

Doc/howto/urllib2.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ fetched, particularly the headers sent by the server. It is currently an
403403
:class:`http.client.HTTPMessage` instance.
404404

405405
Typical headers include 'Content-length', 'Content-type', and so on. See the
406-
`Quick Reference to HTTP Headers <https://www.cs.tut.fi/~jkorpela/http.html>`_
406+
`Quick Reference to HTTP Headers <http://jkorpela.fi/http.html>`_
407407
for a useful listing of HTTP headers with brief explanations of their meaning
408408
and use.
409409

Doc/install/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ modules and extensions.
3636
This guide only covers the basic tools for building and distributing
3737
extensions that are provided as part of this version of Python. Third party
3838
tools offer easier to use and more secure alternatives. Refer to the `quick
39-
recommendations section <https://packaging.python.org/en/latest/current/>`__
39+
recommendations section <https://packaging.python.org/guides/tool-recommendations/>`__
4040
in the Python Packaging User Guide for more information.
4141

4242

Doc/installing/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Key terms
4848
repository of open source licensed packages made available for use by
4949
other Python users.
5050
* the `Python Packaging Authority
51-
<https://www.pypa.io/en/latest/>`__ are the group of
51+
<https://www.pypa.io/>`__ are the group of
5252
developers and documentation authors responsible for the maintenance and
5353
evolution of the standard packaging tools and the associated metadata and
5454
file format standards. They maintain a variety of tools, documentation,

Doc/library/ast.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,5 +261,5 @@ and classes for traversing abstract syntax trees:
261261

262262
.. seealso::
263263

264-
`Green Tree Snakes <https://greentreesnakes.readthedocs.org/>`_, an external documentation resource, has good
264+
`Green Tree Snakes <https://greentreesnakes.readthedocs.io/>`_, an external documentation resource, has good
265265
details on working with Python ASTs.

Doc/library/colorsys.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spaces, the coordinates are all between 0 and 1.
2121
.. seealso::
2222

2323
More information about color spaces can be found at
24-
http://www.poynton.com/ColorFAQ.html and
24+
http://poynton.ca/ColorFAQ.html and
2525
https://www.cambridgeincolour.com/tutorials/color-spaces.htm.
2626

2727
The :mod:`colorsys` module defines the following functions:

Doc/library/hashlib.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ on the hash function used in digital signatures.
562562
by the signer.
563563

564564
(`NIST SP-800-106 "Randomized Hashing for Digital Signatures"
565-
<http://csrc.nist.gov/publications/nistpubs/800-106/NIST-SP-800-106.pdf>`_)
565+
<https://csrc.nist.gov/publications/detail/sp/800-106/final>`_)
566566

567567
In BLAKE2 the salt is processed as a one-time input to the hash function during
568568
initialization, rather than as an input to each compression function.
@@ -728,7 +728,7 @@ Domain Dedication 1.0 Universal:
728728
https://blake2.net
729729
Official BLAKE2 website.
730730

731-
http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
731+
https://csrc.nist.gov/csrc/media/publications/fips/180/2/archive/2002-08-01/documents/fips180-2.pdf
732732
The FIPS 180-2 publication on Secure Hash Algorithms.
733733

734734
https://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms

Doc/library/mailbox.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
620620
`nmh - Message Handling System <http://www.nongnu.org/nmh/>`_
621621
Home page of :program:`nmh`, an updated version of the original :program:`mh`.
622622

623-
`MH & nmh: Email for Users & Programmers <http://rand-mh.sourceforge.net/book/>`_
623+
`MH & nmh: Email for Users & Programmers <https://rand-mh.sourceforge.io/book/>`_
624624
A GPL-licensed book on :program:`mh` and :program:`nmh`, with some information
625625
on the mailbox format.
626626

Doc/library/math.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ Constants
461461
Tau is a circle constant equal to 2\ *π*, the ratio of a circle's circumference to
462462
its radius. To learn more about Tau, check out Vi Hart's video `Pi is (still)
463463
Wrong <https://www.youtube.com/watch?v=jG7vhMMXagQ>`_, and start celebrating
464-
`Tau day <http://tauday.com/>`_ by eating twice as much pie!
464+
`Tau day <https://tauday.com/>`_ by eating twice as much pie!
465465

466466
.. versionadded:: 3.6
467467

Doc/library/plistlib.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ or :class:`datetime.datetime` objects.
3838

3939
.. seealso::
4040

41-
`PList manual page <https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man5/plist.5.html>`_
41+
`PList manual page <https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/PropertyLists/>`_
4242
Apple's documentation of the file format.
4343

4444

Doc/library/ssl.rst

+10-11
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,9 @@ Constants
868868
.. data:: HAS_NPN
869869

870870
Whether the OpenSSL library has built-in support for *Next Protocol
871-
Negotiation* as described in the `NPN draft specification
872-
<https://tools.ietf.org/html/draft-agl-tls-nextprotoneg>`_. When true,
873-
you can use the :meth:`SSLContext.set_npn_protocols` method to advertise
871+
Negotiation* as described in the `Application Layer Protocol
872+
Negotiation <https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_.
873+
When true, you can use the :meth:`SSLContext.set_npn_protocols` method to advertise
874874
which protocols you want to support.
875875

876876
.. versionadded:: 3.3
@@ -1374,7 +1374,7 @@ to speed up repeated connections from the same clients.
13741374
The *capath* string, if present, is
13751375
the path to a directory containing several CA certificates in PEM format,
13761376
following an `OpenSSL specific layout
1377-
<https://www.openssl.org/docs/man1.1.0/ssl/SSL_CTX_load_verify_locations.html>`_.
1377+
<https://www.openssl.org/docs/manmaster/man3/SSL_CTX_load_verify_locations.html>`_.
13781378

13791379
The *cadata* object, if present, is either an ASCII string of one or more
13801380
PEM-encoded certificates or a :term:`bytes-like object` of DER-encoded
@@ -1501,8 +1501,8 @@ to speed up repeated connections from the same clients.
15011501
Specify which protocols the socket should advertise during the SSL/TLS
15021502
handshake. It should be a list of strings, like ``['http/1.1', 'spdy/2']``,
15031503
ordered by preference. The selection of a protocol will happen during the
1504-
handshake, and will play out according to the `NPN draft specification
1505-
<https://tools.ietf.org/html/draft-agl-tls-nextprotoneg>`_. After a
1504+
handshake, and will play out according to the `Application Layer Protocol Negotiation
1505+
<https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_. After a
15061506
successful handshake, the :meth:`SSLSocket.selected_npn_protocol` method will
15071507
return the agreed-upon protocol.
15081508

@@ -1663,8 +1663,7 @@ to speed up repeated connections from the same clients.
16631663
.. method:: SSLContext.session_stats()
16641664

16651665
Get statistics about the SSL sessions created or managed by this context.
1666-
A dictionary is returned which maps the names of each `piece of information
1667-
<https://www.openssl.org/docs/man1.1.0/ssl/SSL_CTX_sess_number.html>`_ to their
1666+
A dictionary is returned which maps the names of each `piece of information <https://www.openssl.org/docs/man1.1.0/ssl/SSL_CTX_sess_number.html>`_ to their
16681667
numeric values. For example, here is the total number of hits and misses
16691668
in the session cache since the context was created::
16701669

@@ -2365,7 +2364,7 @@ enabled when negotiating a SSL session is possible through the
23652364
:meth:`SSLContext.set_ciphers` method. Starting from Python 3.2.3, the
23662365
ssl module disables certain weak ciphers by default, but you may want
23672366
to further restrict the cipher choice. Be sure to read OpenSSL's documentation
2368-
about the `cipher list format <https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT>`_.
2367+
about the `cipher list format <https://www.openssl.org/docs/manmaster/man1/ciphers.html#CIPHER-LIST-FORMAT>`_.
23692368
If you want to check which ciphers are enabled by a given cipher list, use
23702369
:meth:`SSLContext.get_ciphers` or the ``openssl ciphers`` command on your
23712370
system.
@@ -2393,10 +2392,10 @@ successful call of :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or
23932392
`RFC 1422: Privacy Enhancement for Internet Electronic Mail: Part II: Certificate-Based Key Management <https://www.ietf.org/rfc/rfc1422>`_
23942393
Steve Kent
23952394

2396-
`RFC 4086: Randomness Requirements for Security <http://datatracker.ietf.org/doc/rfc4086/>`_
2395+
`RFC 4086: Randomness Requirements for Security <https://datatracker.ietf.org/doc/rfc4086/>`_
23972396
Donald E., Jeffrey I. Schiller
23982397

2399-
`RFC 5280: Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile <http://datatracker.ietf.org/doc/rfc5280/>`_
2398+
`RFC 5280: Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile <https://datatracker.ietf.org/doc/rfc5280/>`_
24002399
D. Cooper
24012400

24022401
`RFC 5246: The Transport Layer Security (TLS) Protocol Version 1.2 <https://tools.ietf.org/html/rfc5246>`_

Doc/library/statistics.rst

-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ However, for reading convenience, most of the examples show sorted sequences.
257257
* "Statistics for the Behavioral Sciences", Frederick J Gravetter and
258258
Larry B Wallnau (8th Edition).
259259

260-
* Calculating the `median <https://www.ualberta.ca/~opscan/median.html>`_.
261-
262260
* The `SSMEDIAN
263261
<https://help.gnome.org/users/gnumeric/stable/gnumeric.html#gnumeric-function-SSMEDIAN>`_
264262
function in the Gnome Gnumeric spreadsheet, including `this discussion

Doc/library/tkinter.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ this should open a window demonstrating a simple Tk interface.
3535
`Tcl/Tk manual <https://www.tcl.tk/man/tcl8.5/>`_
3636
Official manual for the latest tcl/tk version.
3737

38-
`Programming Python <http://learning-python.com/books/about-pp4e.html>`_
38+
`Programming Python <http://learning-python.com/about-pp4e.html>`_
3939
Book by Mark Lutz, has excellent coverage of Tkinter.
4040

4141
`Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_

Doc/library/tkinter.ttk.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ appearance.
2626

2727
.. seealso::
2828

29-
`Tk Widget Styling Support <https://www.tcl.tk/cgi-bin/tct/tip/48>`_
29+
`Tk Widget Styling Support <https://core.tcl.tk/tips/doc/trunk/tip/48.md>`_
3030
A document introducing theming support for Tk
3131

3232

Doc/library/unittest.mock-examples.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ subclass.
10081008
True
10091009

10101010
Sometimes this is inconvenient. For example, `one user
1011-
<https://code.google.com/p/mock/issues/detail?id=105>`_ is subclassing mock to
1011+
<https://code.google.com/archive/p/mock/issues/105>`_ is subclassing mock to
10121012
created a `Twisted adaptor
10131013
<https://twistedmatrix.com/documents/11.0.0/api/twisted.python.components.html>`_.
10141014
Having this applied to attributes too actually causes errors.
@@ -1251,7 +1251,7 @@ With a bit of tweaking you could have the comparison function raise the
12511251
:exc:`AssertionError` directly and provide a more useful failure message.
12521252

12531253
As of version 1.5, the Python testing library `PyHamcrest
1254-
<https://pyhamcrest.readthedocs.org/>`_ provides similar functionality,
1254+
<https://pyhamcrest.readthedocs.io/>`_ provides similar functionality,
12551255
that may be useful here, in the form of its equality matcher
12561256
(`hamcrest.library.integration.match_equality
1257-
<https://pyhamcrest.readthedocs.org/en/release-1.8/integration/#module-hamcrest.library.integration.match_equality>`_).
1257+
<https://pyhamcrest.readthedocs.io/en/release-1.8/integration/#module-hamcrest.library.integration.match_equality>`_).

Doc/library/urllib.request.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The :mod:`urllib.request` module defines the following functions:
6262

6363
* :meth:`~urllib.response.addinfourl.info` --- return the meta-information of the page, such as headers,
6464
in the form of an :func:`email.message_from_string` instance (see
65-
`Quick Reference to HTTP Headers <https://www.cs.tut.fi/~jkorpela/http.html>`_)
65+
`Quick Reference to HTTP Headers <http://jkorpela.fi/http.html>`_)
6666

6767
* :meth:`~urllib.response.addinfourl.getcode` -- return the HTTP status code of the response.
6868

Doc/library/venv.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -458,4 +458,4 @@ subclass which installs setuptools and pip into a created virtual environment::
458458

459459

460460
This script is also available for download `online
461-
<https://gist.github.com/4673395>`_.
461+
<https://gist.github.com/vsajip/4673395>`_.

Doc/library/wsgiref.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ for implementing WSGI servers, a demo HTTP server that serves WSGI applications,
2626
and a validation tool that checks WSGI servers and applications for conformance
2727
to the WSGI specification (:pep:`3333`).
2828

29-
See https://wsgi.readthedocs.org/ for more information about WSGI, and links to
30-
tutorials and other resources.
29+
See `wsgi.readthedocs.io <https://wsgi.readthedocs.io/>`_ for more information about WSGI, and links
30+
to tutorials and other resources.
3131

3232
.. XXX If you're just trying to write a web application...
3333

Doc/library/xml.dom.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ implementations are free to support the strict mapping from IDL). See section
6767

6868
.. seealso::
6969

70-
`Document Object Model (DOM) Level 2 Specification <https://www.w3.org/TR/DOM-Level-2-Core/>`_
70+
`Document Object Model (DOM) Level 2 Specification <https://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/>`_
7171
The W3C recommendation upon which the Python DOM API is based.
7272

7373
`Document Object Model (DOM) Level 1 Specification <https://www.w3.org/TR/REC-DOM-Level-1/>`_
7474
The W3C recommendation for the DOM supported by :mod:`xml.dom.minidom`.
7575

76-
`Python Language Mapping Specification <http://www.omg.org/spec/PYTH/1.2/PDF>`_
76+
`Python Language Mapping Specification <http://www.omg.org/cgi-bin/doc?formal/02-11-05.pdf>`_
7777
This specifies the mapping from OMG IDL to Python.
7878

7979

0 commit comments

Comments
 (0)