From 537c0342e0d0676d451884b63eb2b76c21b4800a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Wirtel?= Date: Tue, 15 May 2018 20:58:35 +0200 Subject: [PATCH] [2.7] bpo-33503: Fix the broken pypi link in the source and the documentation (GH-6814). (cherry picked from commit 19177fbd5d6d9b29ccc302d65f9d9417ece082ce) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Wirtel --- Doc/README.txt | 2 +- Doc/distributing/index.rst | 2 +- Doc/distutils/apiref.rst | 2 +- Doc/distutils/packageindex.rst | 2 +- Doc/distutils/setupscript.rst | 2 +- Doc/faq/general.rst | 2 +- Doc/faq/library.rst | 4 ++-- Doc/howto/pyporting.rst | 14 +++++++------- Doc/howto/webservers.rst | 4 ++-- Doc/installing/index.rst | 5 ++--- Doc/library/bz2.rst | 2 +- Doc/library/datetime.rst | 2 +- Doc/library/distribution.rst | 2 +- Doc/library/index.rst | 2 +- Doc/library/pprint.rst | 1 - Doc/library/re.rst | 2 +- Doc/library/ssl.rst | 2 +- Doc/library/subprocess.rst | 2 +- Doc/library/unittest.rst | 2 +- Doc/library/xml.rst | 4 ++-- Doc/tutorial/whatnow.rst | 2 +- Doc/using/windows.rst | 2 +- Doc/whatsnew/2.3.rst | 2 +- Doc/whatsnew/2.5.rst | 2 +- Doc/whatsnew/2.7.rst | 2 +- .../2018-05-14-20-08-58.bpo-33503.Wvt0qg.rst | 1 + 26 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 Misc/NEWS.d/next/Documentation/2018-05-14-20-08-58.bpo-33503.Wvt0qg.rst diff --git a/Doc/README.txt b/Doc/README.txt index 4f8e9f8f1417fbc..a362ecca942731c 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -15,7 +15,7 @@ Building the docs You need to have Sphinx installed; it is the toolset used to build the docs. It is not included in this tree, but maintained -separately and available from PyPI . +separately and available from PyPI . Using make diff --git a/Doc/distributing/index.rst b/Doc/distributing/index.rst index 82ecd2c1ef45fbe..b0dccb3db1ddf4b 100644 --- a/Doc/distributing/index.rst +++ b/Doc/distributing/index.rst @@ -31,7 +31,7 @@ installing other Python projects, refer to the Key terms ========= -* the `Python Packaging Index `__ is a public +* the `Python Packaging Index `__ is a public repository of open source licensed packages made available for use by other Python users * the `Python Packaging Authority diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index 18844dd7679cf9d..34a3cb34af32bf3 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -78,7 +78,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and | | be built | :class:`distutils.core.Extension` | +--------------------+--------------------------------+-------------------------------------------------------------+ | *classifiers* | A list of categories for the | a list of strings; valid classifiers are listed on `PyPI | - | | package | `_. | + | | package | `_. | +--------------------+--------------------------------+-------------------------------------------------------------+ | *distclass* | the :class:`Distribution` | a subclass of | | | class to use | :class:`distutils.core.Distribution` | diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst index 80875845f6807d7..cd11f20df802549 100644 --- a/Doc/distutils/packageindex.rst +++ b/Doc/distutils/packageindex.rst @@ -248,4 +248,4 @@ without warnings does not guarantee that PyPI will convert the content successfully. -.. _Python Package Index (PyPI): https://pypi.python.org/pypi +.. _Python Package Index (PyPI): https://pypi.org diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 6b82c40546ca755..92ab5732d2b5593 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -606,7 +606,7 @@ Notes: (4) These fields should not be used if your package is to be compatible with Python versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website - `_. + `_. (5) The ``long_description`` field is used by PyPI when you are diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 35cad55c3a9e5ed..eb1bd16b4b8b9d3 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -117,7 +117,7 @@ programming), software engineering (unit testing, logging, profiling, parsing Python code), and operating system interfaces (system calls, filesystems, TCP/IP sockets). Look at the table of contents for :ref:`library-index` to get an idea of what's available. A wide variety of third-party extensions are also -available. Consult `the Python Package Index `_ to +available. Consult `the Python Package Index `_ to find packages of interest to you. diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst index d1b3efb4d7fd3f2..a25946538e45dab 100644 --- a/Doc/faq/library.rst +++ b/Doc/faq/library.rst @@ -19,7 +19,7 @@ standard library module. (Eventually you'll learn what's in the standard library and will be able to skip this step.) For third-party packages, search the `Python Package Index -`_ or try `Google `_ or +`_ or try `Google `_ or another Web search engine. Searching for "Python" plus a keyword or two for your topic of interest will usually find something helpful. @@ -585,7 +585,7 @@ substituted for standard input and output. You will have to use pseudo ttys ("ptys") instead of pipes. Or you can use a Python interface to Don Libes' "expect" library. A Python extension that interfaces to expect is called "expy" and available from http://expectpy.sourceforge.net. A pure Python solution that -works like expect is `pexpect `_. +works like expect is `pexpect `_. How do I access the serial (RS232) port? diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst index 8562d2373749f08..88b01779d2a5f49 100644 --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -427,25 +427,25 @@ to make sure everything functions as expected in both versions of Python. .. _2to3: https://docs.python.org/3/library/2to3.html -.. _caniusepython3: https://pypi.python.org/pypi/caniusepython3 +.. _caniusepython3: https://pypi.org/project/caniusepython3 .. _cheat sheet: http://python-future.org/compatible_idioms.html -.. _coverage.py: https://pypi.python.org/pypi/coverage +.. _coverage.py: https://pypi.org/project/coverage .. _Futurize: http://python-future.org/automatic_conversion.html .. _importlib: https://docs.python.org/3/library/importlib.html#module-importlib -.. _importlib2: https://pypi.python.org/pypi/importlib2 +.. _importlib2: https://pypi.org/project/importlib2 .. _Modernize: https://python-modernize.readthedocs.org/en/latest/ .. _mypy: http://mypy-lang.org/ .. _Porting to Python 3: http://python3porting.com/ -.. _Pylint: https://pypi.python.org/pypi/pylint +.. _Pylint: https://pypi.org/project/pylint .. _Python 3 Q & A: https://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions_and_answers.html .. _pytype: https://github.com/google/pytype .. _python-future: http://python-future.org/ .. _python-porting: https://mail.python.org/mailman/listinfo/python-porting -.. _six: https://pypi.python.org/pypi/six -.. _tox: https://pypi.python.org/pypi/tox -.. _trove classifier: https://pypi.python.org/pypi?%3Aaction=list_classifiers +.. _six: https://pypi.org/project/six +.. _tox: https://pypi.org/project/tox +.. _trove classifier: https://pypi.org/classifiers .. _"What's New": https://docs.python.org/3/whatsnew/index.html diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst index a555083e3255865..5071a8a33cb9408 100644 --- a/Doc/howto/webservers.rst +++ b/Doc/howto/webservers.rst @@ -301,7 +301,7 @@ following WSGI-application:: WSGIServer(app).run() This is a simple WSGI application, but you need to install `flup -`_ first, as flup handles the low level +`_ first, as flup handles the low level FastCGI access. .. seealso:: @@ -583,7 +583,7 @@ alternate storage mechanism. helps with choosing a method for saving data * `SQLAlchemy `_, the most powerful OR-Mapper - for Python, and `Elixir `_, which makes + for Python, and `Elixir `_, which makes SQLAlchemy easier to use * `SQLObject `_, another popular OR-Mapper diff --git a/Doc/installing/index.rst b/Doc/installing/index.rst index cbbb88240680f7e..9b89d083af3d862 100644 --- a/Doc/installing/index.rst +++ b/Doc/installing/index.rst @@ -39,9 +39,8 @@ Key terms being installed system wide * ``virtualenv`` is a third party tools for creating virtual environments, it is defaults to installing ``pip`` into all created virtual environments. -* the `Python Packaging Index `__ is a public - repository of open source licensed packages made available for use by - other Python users +* the `Python Packaging Index `__ is a public repository of + open source licensed packages made available for use by other Python users * the `Python Packaging Authority `__ are the group of developers and documentation authors responsible for the maintenance and diff --git a/Doc/library/bz2.rst b/Doc/library/bz2.rst index 71957ec06e5844a..e764f39395445a8 100644 --- a/Doc/library/bz2.rst +++ b/Doc/library/bz2.rst @@ -74,7 +74,7 @@ Handling of compressed files is offered by the :class:`BZ2File` class. input file, only the first stream will be accessible. If you require support for multi-stream files, consider using the third-party :mod:`bz2file` module (available from - `PyPI `_). This module provides a + `PyPI `_). This module provides a backport of Python 3.3's :class:`BZ2File` class, which does support multi-stream files. diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index b8d86e3b5a732f7..d2c1c563863ff31 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1566,7 +1566,7 @@ EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)). .. seealso:: - `pytz `_ + `pytz `_ The standard library has no :class:`tzinfo` instances, but there exists a third-party library which brings the *IANA timezone database* (also known as the Olson database) to Python: *pytz*. diff --git a/Doc/library/distribution.rst b/Doc/library/distribution.rst index b56099957279c08..21dd18d94a4503e 100644 --- a/Doc/library/distribution.rst +++ b/Doc/library/distribution.rst @@ -4,7 +4,7 @@ Software Packaging and Distribution These libraries help you with publishing and installing Python software. While these modules are designed to work in conjunction with the -`Python Package Index `__, they can also be used +`Python Package Index `__, they can also be used with a local index server, or without any index server at all. .. toctree:: diff --git a/Doc/library/index.rst b/Doc/library/index.rst index 97cf3ea75cc8c46..31ca6df1d157f89 100644 --- a/Doc/library/index.rst +++ b/Doc/library/index.rst @@ -30,7 +30,7 @@ optional components. In addition to the standard library, there is a growing collection of several thousand components (from individual programs and modules to packages and entire application development frameworks), available from -the `Python Package Index `_. +the `Python Package Index `_. .. toctree:: diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index ffa27d4255ffb47..3f09b21d8532d3a 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -234,4 +234,3 @@ parameters. ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'], ['cccccccccccccccccccc', 'dddddddddddddddddddd']] - diff --git a/Doc/library/re.rst b/Doc/library/re.rst index c424230e13a4191..228fcfedf4f3ed2 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -35,7 +35,7 @@ fine-tuning parameters. .. seealso:: - The third-party `regex `_ module, + The third-party `regex `_ module, which has an API compatible with the standard library :mod:`re` module, but offers additional functionality and a more thorough Unicode support. diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 89b9ff3621f7b7e..a612e6ebd3925c8 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -1586,7 +1586,7 @@ Visual inspection shows that the certificate does identify the desired service (('commonName', 'www.python.org'),)), 'subjectAltName': (('DNS', 'www.python.org'), ('DNS', 'python.org'), - ('DNS', 'pypi.python.org'), + ('DNS', 'pypi.org'), ('DNS', 'docs.python.org'), ('DNS', 'testpypi.python.org'), ('DNS', 'bugs.python.org'), diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 284cf4465aac7f2..53a0161d4b0301a 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -32,7 +32,7 @@ functions can be found in the subprocess-replacements_ section. :pep:`324` -- PEP proposing the subprocess module -.. _subprocess32: https://pypi.python.org/pypi/subprocess32/ +.. _subprocess32: https://pypi.org/project/subprocess32/ Using the :mod:`subprocess` Module ---------------------------------- diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index b36126e1cc6587b..0915926ab7c1376 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -78,7 +78,7 @@ need to derive from a specific class. Module :mod:`doctest` Another test-support module with a very different flavor. - `unittest2: A backport of new unittest features for Python 2.4-2.6 `_ + `unittest2: A backport of new unittest features for Python 2.4-2.6 `_ Many new features were added to unittest in Python 2.7, including test discovery. unittest2 allows you to use these features with earlier versions of Python. diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst index a8f20cdbf488293..b107c29c6405565 100644 --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -129,8 +129,8 @@ break backward compatibility. After all inline DTD and entity expansion are well-defined XML features. -.. _defusedxml: https://pypi.python.org/pypi/defusedxml/ -.. _defusedexpat: https://pypi.python.org/pypi/defusedexpat/ +.. _defusedxml: https://pypi.org/project/defusedxml/ +.. _defusedexpat: https://pypi.org/project/defusedexpat/ .. _Billion Laughs: https://en.wikipedia.org/wiki/Billion_laughs .. _ZIP bomb: https://en.wikipedia.org/wiki/Zip_bomb .. _DTD: https://en.wikipedia.org/wiki/Document_type_definition diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst index 89dfa6a15700ce3..f6ce4f4617e8252 100644 --- a/Doc/tutorial/whatnow.rst +++ b/Doc/tutorial/whatnow.rst @@ -38,7 +38,7 @@ More Python resources: * https://docs.python.org: Fast access to Python's documentation. -* https://pypi.python.org/pypi: The Python Package Index, previously also nicknamed +* https://pypi.org: The Python Package Index, previously also nicknamed the Cheese Shop, is an index of user-created Python modules that are available for download. Once you begin releasing code, you can register it here so that others can find it. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index f597476e333cfaf..778b8843f236423 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -242,7 +242,7 @@ The Windows-specific standard modules are documented in PyWin32 ------- -The `PyWin32 `_ module by Mark Hammond +The `PyWin32 `_ module by Mark Hammond is a collection of modules for advanced Windows-specific support. This includes utilities for: diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst index 838ca38f3186bba..1ef2cb5f986cb3c 100644 --- a/Doc/whatsnew/2.3.rst +++ b/Doc/whatsnew/2.3.rst @@ -659,7 +659,7 @@ The heart of the catalog is the new Distutils :command:`register` command. Running ``python setup.py register`` will collect the metadata describing a package, such as its name, version, maintainer, description, &c., and send it to a central catalog server. The resulting catalog is available from -https://pypi.python.org/pypi. +https://pypi.org. To make the catalog a bit more useful, a new optional *classifiers* keyword argument has been added to the Distutils :func:`setup` function. A list of diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index d2395e7097a2471..6400bb108610d26 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -229,7 +229,7 @@ required packages. :: ) Another new enhancement to the Python package index at -https://pypi.python.org is storing source and binary archives for a +https://pypi.org is storing source and binary archives for a package. The new :command:`upload` Distutils command will upload a package to the repository. diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst index 53333ebf7c1a3a0..a18abe8141e775a 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -1809,7 +1809,7 @@ new features were added. Most of these features were implemented by Michael Foord, unless otherwise noted. The enhanced version of the module is downloadable separately for use with Python versions 2.4 to 2.6, packaged as the :mod:`unittest2` package, from -https://pypi.python.org/pypi/unittest2. +https://pypi.org/project/unittest2. When used from the command line, the module can automatically discover tests. It's not as fancy as `py.test `__ or diff --git a/Misc/NEWS.d/next/Documentation/2018-05-14-20-08-58.bpo-33503.Wvt0qg.rst b/Misc/NEWS.d/next/Documentation/2018-05-14-20-08-58.bpo-33503.Wvt0qg.rst new file mode 100644 index 000000000000000..27025c31a03654c --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-05-14-20-08-58.bpo-33503.Wvt0qg.rst @@ -0,0 +1 @@ +Fix broken pypi link