diff options
author | Stéphane Wirtel <stephane@wirtel.be> | 2018-05-15 20:58:35 +0200 |
---|---|---|
committer | Ned Deily <nad@python.org> | 2018-05-15 14:58:35 -0400 |
commit | 19177fbd5d6d9b29ccc302d65f9d9417ece082ce (patch) | |
tree | 202e95daf156bad46c0ee152701fd2d904ffbe11 /Doc/library | |
parent | b056562860c227bad2e0ba7cd3130e115c007768 (diff) | |
download | cpython-git-19177fbd5d6d9b29ccc302d65f9d9417ece082ce.tar.gz |
bpo-33503: Fix the broken pypi link in the source and the documentation (GH-6814)
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/distribution.rst | 2 | ||||
-rw-r--r-- | Doc/library/index.rst | 2 | ||||
-rw-r--r-- | Doc/library/pprint.rst | 20 | ||||
-rw-r--r-- | Doc/library/re.rst | 2 | ||||
-rw-r--r-- | Doc/library/ssl.rst | 4 | ||||
-rw-r--r-- | Doc/library/unittest.mock.rst | 4 | ||||
-rw-r--r-- | Doc/library/xml.rst | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/Doc/library/distribution.rst b/Doc/library/distribution.rst index 3e6e84b42a..8d4befe41b 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 <https://pypi.python.org/pypi>`__, they can also be used +`Python Package Index <https://pypi.org>`__, 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 da6a460e2c..b8fbf44ae4 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 <https://pypi.python.org/pypi>`_. +the `Python Package Index <https://pypi.org>`_. .. toctree:: diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index 65d94fe386..aa97d3eaba 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -212,12 +212,12 @@ Example ------- To demonstrate several uses of the :func:`pprint` function and its parameters, -let's fetch information about a project from `PyPI <https://pypi.python.org/pypi>`_:: +let's fetch information about a project from `PyPI <https://pypi.org>`_:: >>> import json >>> import pprint >>> from urllib.request import urlopen - >>> with urlopen('http://pypi.python.org/pypi/Twisted/json') as url: + >>> with urlopen('http://pypi.org/project/Twisted/json') as url: ... http_info = url.info() ... raw_data = url.read().decode(http_info.get_content_charset()) >>> project_info = json.loads(raw_data) @@ -248,9 +248,9 @@ In its basic form, :func:`pprint` shows the whole object:: 'maintainer': '', 'maintainer_email': '', 'name': 'Twisted', - 'package_url': 'http://pypi.python.org/pypi/Twisted', + 'package_url': 'http://pypi.org/project/Twisted', 'platform': 'UNKNOWN', - 'release_url': 'http://pypi.python.org/pypi/Twisted/12.3.0', + 'release_url': 'http://pypi.org/project/Twisted/12.3.0', 'requires_python': None, 'stable_version': None, 'summary': 'An asynchronous networking framework written in Python', @@ -264,7 +264,7 @@ In its basic form, :func:`pprint` shows the whole object:: 'python_version': 'source', 'size': 2615733, 'upload_time': '2012-12-26T12:47:03', - 'url': 'https://pypi.python.org/packages/source/T/Twisted/Twisted-12.3.0.tar.bz2'}, + 'url': 'https://pypi.org/packages/source/T/Twisted/Twisted-12.3.0.tar.bz2'}, {'comment_text': '', 'downloads': 5224, 'filename': 'Twisted-12.3.0.win32-py2.7.msi', @@ -274,7 +274,7 @@ In its basic form, :func:`pprint` shows the whole object:: 'python_version': '2.7', 'size': 2916352, 'upload_time': '2012-12-26T12:48:15', - 'url': 'https://pypi.python.org/packages/2.7/T/Twisted/Twisted-12.3.0.win32-py2.7.msi'}]} + 'url': 'https://pypi.org/packages/2.7/T/Twisted/Twisted-12.3.0.win32-py2.7.msi'}]} The result can be limited to a certain *depth* (ellipsis is used for deeper contents):: @@ -301,9 +301,9 @@ contents):: 'maintainer': '', 'maintainer_email': '', 'name': 'Twisted', - 'package_url': 'http://pypi.python.org/pypi/Twisted', + 'package_url': 'http://pypi.org/project/Twisted', 'platform': 'UNKNOWN', - 'release_url': 'http://pypi.python.org/pypi/Twisted/12.3.0', + 'release_url': 'http://pypi.org/project/Twisted/12.3.0', 'requires_python': None, 'stable_version': None, 'summary': 'An asynchronous networking framework written in Python', @@ -339,9 +339,9 @@ cannot be split, the specified width will be exceeded:: 'maintainer': '', 'maintainer_email': '', 'name': 'Twisted', - 'package_url': 'http://pypi.python.org/pypi/Twisted', + 'package_url': 'http://pypi.org/project/Twisted', 'platform': 'UNKNOWN', - 'release_url': 'http://pypi.python.org/pypi/Twisted/12.3.0', + 'release_url': 'http://pypi.org/project/Twisted/12.3.0', 'requires_python': None, 'stable_version': None, 'summary': 'An asynchronous networking ' diff --git a/Doc/library/re.rst b/Doc/library/re.rst index ddb74f8d38..b5a8883459 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -45,7 +45,7 @@ fine-tuning parameters. .. seealso:: - The third-party `regex <https://pypi.python.org/pypi/regex/>`_ module, + The third-party `regex <https://pypi.org/project/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 8082a383d5..f96549427a 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -2158,9 +2158,9 @@ 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', 'testpypi.org'), ('DNS', 'bugs.python.org'), ('DNS', 'wiki.python.org'), ('DNS', 'hg.python.org'), diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index ac9dd3b6f7..bb647bb6a8 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -35,7 +35,7 @@ is based on the 'action -> assertion' pattern instead of 'record -> replay' used by many mocking frameworks. There is a backport of :mod:`unittest.mock` for earlier versions of Python, -available as `mock on PyPI <https://pypi.python.org/pypi/mock>`_. +available as `mock on PyPI <https://pypi.org/project/mock>`_. Quick Guide @@ -2085,7 +2085,7 @@ mock_open the start. If you need more control over the data that you are feeding to the tested code you will need to customize this mock for yourself. When that is insufficient, one of the in-memory filesystem packages on `PyPI - <https://pypi.python.org/pypi>`_ can offer a realistic filesystem for testing. + <https://pypi.org>`_ can offer a realistic filesystem for testing. .. versionchanged:: 3.4 Added :meth:`~io.IOBase.readline` and :meth:`~io.IOBase.readlines` support. diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst index d833b7fe99..63c24f80ac 100644 --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -130,8 +130,8 @@ but will not be included in any bugfix releases of Python because they break backward compatibility. -.. _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 |