Skip to content

Commit 19177fb

Browse files
matrixisened-deily
matrixise
authored and
ned-deily
committed
bpo-33503: Fix the broken pypi link in the source and the documentation (GH-6814)
1 parent b056562 commit 19177fb

24 files changed

+45
-44
lines changed

‎Doc/distributing/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ installing other Python projects, refer to the
3131
Key terms
3232
=========
3333

34-
* the `Python Packaging Index <https://pypi.python.org/pypi>`__ is a public
34+
* the `Python Packaging Index <https://pypi.org>`__ is a public
3535
repository of open source licensed packages made available for use by
3636
other Python users
3737
* the `Python Packaging Authority

‎Doc/distutils/apiref.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and
7878
| | be built | :class:`distutils.core.Extension` |
7979
+--------------------+--------------------------------+-------------------------------------------------------------+
8080
| *classifiers* | A list of categories for the | a list of strings; valid classifiers are listed on `PyPI |
81-
| | package | <https://pypi.python.org/pypi?:action=list_classifiers>`_. |
81+
| | package | <https://pypi.org/classifiers>`_. |
8282
+--------------------+--------------------------------+-------------------------------------------------------------+
8383
| *distclass* | the :class:`Distribution` | a subclass of |
8484
| | class to use | :class:`distutils.core.Distribution` |

‎Doc/distutils/packageindex.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,4 @@ without warnings does not guarantee that PyPI will convert the content
250250
successfully.
251251

252252

253-
.. _Python Package Index (PyPI): https://pypi.python.org/pypi
253+
.. _Python Package Index (PyPI): https://pypi.org

‎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 <https://pypi.python.org/pypi?:action=list_classifiers>`_.
628+
`PyPI <https://pypi.org/classifiers>`_.
629629

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

‎Doc/faq/general.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ programming), software engineering (unit testing, logging, profiling, parsing
117117
Python code), and operating system interfaces (system calls, filesystems, TCP/IP
118118
sockets). Look at the table of contents for :ref:`library-index` to get an idea
119119
of what's available. A wide variety of third-party extensions are also
120-
available. Consult `the Python Package Index <https://pypi.python.org/pypi>`_ to
120+
available. Consult `the Python Package Index <https://pypi.org>`_ to
121121
find packages of interest to you.
122122

123123

‎Doc/faq/library.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ standard library module. (Eventually you'll learn what's in the standard
1919
library and will be able to skip this step.)
2020

2121
For third-party packages, search the `Python Package Index
22-
<https://pypi.python.org/pypi>`_ or try `Google <https://www.google.com>`_ or
22+
<https://pypi.org>`_ or try `Google <https://www.google.com>`_ or
2323
another Web search engine. Searching for "Python" plus a keyword or two for
2424
your topic of interest will usually find something helpful.
2525

@@ -611,7 +611,7 @@ use ``p.read(n)``.
611611
"expect" library. A Python extension that interfaces to expect is called
612612
"expy" and available from http://expectpy.sourceforge.net. A pure Python
613613
solution that works like expect is `pexpect
614-
<https://pypi.python.org/pypi/pexpect/>`_.
614+
<https://pypi.org/project/pexpect/>`_.
615615
616616
617617
How do I access the serial (RS232) port?

‎Doc/howto/curses.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ appearance---and the curses library will figure out what control codes
4141
need to be sent to the terminal to produce the right output. curses
4242
doesn't provide many user-interface concepts such as buttons, checkboxes,
4343
or dialogs; if you need such features, consider a user interface library such as
44-
`Urwid <https://pypi.python.org/pypi/urwid/>`_.
44+
`Urwid <https://pypi.org/project/urwid/>`_.
4545

4646
The curses library was originally written for BSD Unix; the later System V
4747
versions of Unix from AT&T added many enhancements and new functions. BSD curses
@@ -55,7 +55,7 @@ everything, though.
5555

5656
The Windows version of Python doesn't include the :mod:`curses`
5757
module. A ported version called `UniCurses
58-
<https://pypi.python.org/pypi/UniCurses>`_ is available. You could
58+
<https://pypi.org/project/UniCurses>`_ is available. You could
5959
also try `the Console module <http://effbot.org/zone/console-index.htm>`_
6060
written by Fredrik Lundh, which doesn't
6161
use the same API as curses but provides cursor-addressable text output
@@ -432,7 +432,7 @@ User Input
432432

433433
The C curses library offers only very simple input mechanisms. Python's
434434
:mod:`curses` module adds a basic text-input widget. (Other libraries
435-
such as `Urwid <https://pypi.python.org/pypi/urwid/>`_ have more extensive
435+
such as `Urwid <https://pypi.org/project/urwid/>`_ have more extensive
436436
collections of widgets.)
437437

438438
There are two methods for getting input from a window:

‎Doc/howto/pyporting.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -427,25 +427,25 @@ to make sure everything functions as expected in both versions of Python.
427427

428428

429429
.. _2to3: https://docs.python.org/3/library/2to3.html
430-
.. _caniusepython3: https://pypi.python.org/pypi/caniusepython3
430+
.. _caniusepython3: https://pypi.org/project/caniusepython3
431431
.. _cheat sheet: http://python-future.org/compatible_idioms.html
432-
.. _coverage.py: https://pypi.python.org/pypi/coverage
432+
.. _coverage.py: https://pypi.org/project/coverage
433433
.. _Futurize: http://python-future.org/automatic_conversion.html
434434
.. _importlib: https://docs.python.org/3/library/importlib.html#module-importlib
435-
.. _importlib2: https://pypi.python.org/pypi/importlib2
435+
.. _importlib2: https://pypi.org/project/importlib2
436436
.. _Modernize: https://python-modernize.readthedocs.io/
437437
.. _mypy: http://mypy-lang.org/
438438
.. _Porting to Python 3: http://python3porting.com/
439-
.. _Pylint: https://pypi.python.org/pypi/pylint
439+
.. _Pylint: https://pypi.org/project/pylint
440440

441441
.. _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/
445445
.. _python-porting: https://mail.python.org/mailman/listinfo/python-porting
446-
.. _six: https://pypi.python.org/pypi/six
447-
.. _tox: https://pypi.python.org/pypi/tox
448-
.. _trove classifier: https://pypi.python.org/pypi?%3Aaction=list_classifiers
446+
.. _six: https://pypi.org/project/six
447+
.. _tox: https://pypi.org/project/tox
448+
.. _trove classifier: https://pypi.org/classifiers
449449

450450
.. _"What's New": https://docs.python.org/3/whatsnew/index.html
451451

‎Doc/installing/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Key terms
4444
``venv``. It allows virtual environments to be used on versions of
4545
Python prior to 3.4, which either don't provide ``venv`` at all, or
4646
aren't able to automatically install ``pip`` into created environments.
47-
* The `Python Packaging Index <https://pypi.python.org/pypi>`__ is a public
47+
* The `Python Packaging Index <https://pypi.org>`__ is a public
4848
repository of open source licensed packages made available for use by
4949
other Python users.
5050
* the `Python Packaging Authority

‎Doc/library/distribution.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Software Packaging and Distribution
44

55
These libraries help you with publishing and installing Python software.
66
While these modules are designed to work in conjunction with the
7-
`Python Package Index <https://pypi.python.org/pypi>`__, they can also be used
7+
`Python Package Index <https://pypi.org>`__, they can also be used
88
with a local index server, or without any index server at all.
99

1010
.. toctree::

‎Doc/library/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ optional components.
3030
In addition to the standard library, there is a growing collection of
3131
several thousand components (from individual programs and modules to
3232
packages and entire application development frameworks), available from
33-
the `Python Package Index <https://pypi.python.org/pypi>`_.
33+
the `Python Package Index <https://pypi.org>`_.
3434

3535

3636
.. toctree::

‎Doc/library/pprint.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ Example
212212
-------
213213

214214
To demonstrate several uses of the :func:`pprint` function and its parameters,
215-
let's fetch information about a project from `PyPI <https://pypi.python.org/pypi>`_::
215+
let's fetch information about a project from `PyPI <https://pypi.org>`_::
216216

217217
>>> import json
218218
>>> import pprint
219219
>>> from urllib.request import urlopen
220-
>>> with urlopen('http://pypi.python.org/pypi/Twisted/json') as url:
220+
>>> with urlopen('http://pypi.org/project/Twisted/json') as url:
221221
... http_info = url.info()
222222
... raw_data = url.read().decode(http_info.get_content_charset())
223223
>>> project_info = json.loads(raw_data)
@@ -248,9 +248,9 @@ In its basic form, :func:`pprint` shows the whole object::
248248
'maintainer': '',
249249
'maintainer_email': '',
250250
'name': 'Twisted',
251-
'package_url': 'http://pypi.python.org/pypi/Twisted',
251+
'package_url': 'http://pypi.org/project/Twisted',
252252
'platform': 'UNKNOWN',
253-
'release_url': 'http://pypi.python.org/pypi/Twisted/12.3.0',
253+
'release_url': 'http://pypi.org/project/Twisted/12.3.0',
254254
'requires_python': None,
255255
'stable_version': None,
256256
'summary': 'An asynchronous networking framework written in Python',
@@ -264,7 +264,7 @@ In its basic form, :func:`pprint` shows the whole object::
264264
'python_version': 'source',
265265
'size': 2615733,
266266
'upload_time': '2012-12-26T12:47:03',
267-
'url': 'https://pypi.python.org/packages/source/T/Twisted/Twisted-12.3.0.tar.bz2'},
267+
'url': 'https://pypi.org/packages/source/T/Twisted/Twisted-12.3.0.tar.bz2'},
268268
{'comment_text': '',
269269
'downloads': 5224,
270270
'filename': 'Twisted-12.3.0.win32-py2.7.msi',
@@ -274,7 +274,7 @@ In its basic form, :func:`pprint` shows the whole object::
274274
'python_version': '2.7',
275275
'size': 2916352,
276276
'upload_time': '2012-12-26T12:48:15',
277-
'url': 'https://pypi.python.org/packages/2.7/T/Twisted/Twisted-12.3.0.win32-py2.7.msi'}]}
277+
'url': 'https://pypi.org/packages/2.7/T/Twisted/Twisted-12.3.0.win32-py2.7.msi'}]}
278278

279279
The result can be limited to a certain *depth* (ellipsis is used for deeper
280280
contents)::
@@ -301,9 +301,9 @@ contents)::
301301
'maintainer': '',
302302
'maintainer_email': '',
303303
'name': 'Twisted',
304-
'package_url': 'http://pypi.python.org/pypi/Twisted',
304+
'package_url': 'http://pypi.org/project/Twisted',
305305
'platform': 'UNKNOWN',
306-
'release_url': 'http://pypi.python.org/pypi/Twisted/12.3.0',
306+
'release_url': 'http://pypi.org/project/Twisted/12.3.0',
307307
'requires_python': None,
308308
'stable_version': None,
309309
'summary': 'An asynchronous networking framework written in Python',
@@ -339,9 +339,9 @@ cannot be split, the specified width will be exceeded::
339339
'maintainer': '',
340340
'maintainer_email': '',
341341
'name': 'Twisted',
342-
'package_url': 'http://pypi.python.org/pypi/Twisted',
342+
'package_url': 'http://pypi.org/project/Twisted',
343343
'platform': 'UNKNOWN',
344-
'release_url': 'http://pypi.python.org/pypi/Twisted/12.3.0',
344+
'release_url': 'http://pypi.org/project/Twisted/12.3.0',
345345
'requires_python': None,
346346
'stable_version': None,
347347
'summary': 'An asynchronous networking '

‎Doc/library/re.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fine-tuning parameters.
4545

4646
.. seealso::
4747

48-
The third-party `regex <https://pypi.python.org/pypi/regex/>`_ module,
48+
The third-party `regex <https://pypi.org/project/regex/>`_ module,
4949
which has an API compatible with the standard library :mod:`re` module,
5050
but offers additional functionality and a more thorough Unicode support.
5151

‎Doc/library/ssl.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -2158,9 +2158,9 @@ Visual inspection shows that the certificate does identify the desired service
21582158
(('commonName', 'www.python.org'),)),
21592159
'subjectAltName': (('DNS', 'www.python.org'),
21602160
('DNS', 'python.org'),
2161-
('DNS', 'pypi.python.org'),
2161+
('DNS', 'pypi.org'),
21622162
('DNS', 'docs.python.org'),
2163-
('DNS', 'testpypi.python.org'),
2163+
('DNS', 'testpypi.org'),
21642164
('DNS', 'bugs.python.org'),
21652165
('DNS', 'wiki.python.org'),
21662166
('DNS', 'hg.python.org'),

‎Doc/library/unittest.mock.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ is based on the 'action -> assertion' pattern instead of 'record -> replay'
3535
used by many mocking frameworks.
3636

3737
There is a backport of :mod:`unittest.mock` for earlier versions of Python,
38-
available as `mock on PyPI <https://pypi.python.org/pypi/mock>`_.
38+
available as `mock on PyPI <https://pypi.org/project/mock>`_.
3939

4040

4141
Quick Guide
@@ -2085,7 +2085,7 @@ mock_open
20852085
the start. If you need more control over the data that you are feeding to
20862086
the tested code you will need to customize this mock for yourself. When that
20872087
is insufficient, one of the in-memory filesystem packages on `PyPI
2088-
<https://pypi.python.org/pypi>`_ can offer a realistic filesystem for testing.
2088+
<https://pypi.org>`_ can offer a realistic filesystem for testing.
20892089

20902090
.. versionchanged:: 3.4
20912091
Added :meth:`~io.IOBase.readline` and :meth:`~io.IOBase.readlines` support.

‎Doc/library/xml.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ but will not be included in any bugfix releases of
130130
Python because they break backward compatibility.
131131

132132

133-
.. _defusedxml: https://pypi.python.org/pypi/defusedxml/
134-
.. _defusedexpat: https://pypi.python.org/pypi/defusedexpat/
133+
.. _defusedxml: https://pypi.org/project/defusedxml/
134+
.. _defusedexpat: https://pypi.org/project/defusedexpat/
135135
.. _Billion Laughs: https://en.wikipedia.org/wiki/Billion_laughs
136136
.. _ZIP bomb: https://en.wikipedia.org/wiki/Zip_bomb
137137
.. _DTD: https://en.wikipedia.org/wiki/Document_type_definition

‎Doc/tutorial/venv.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Managing Packages with pip
8888

8989
You can install, upgrade, and remove packages using a program called
9090
:program:`pip`. By default ``pip`` will install packages from the Python
91-
Package Index, <https://pypi.python.org/pypi>. You can browse the Python
91+
Package Index, <https://pypi.org>. You can browse the Python
9292
Package Index by going to it in your web browser, or you can use ``pip``'s
9393
limited search feature:
9494

‎Doc/tutorial/whatnow.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ More Python resources:
3838

3939
* https://docs.python.org: Fast access to Python's documentation.
4040

41-
* https://pypi.python.org/pypi: The Python Package Index, previously also nicknamed
41+
* https://pypi.org: The Python Package Index, previously also nicknamed
4242
the Cheese Shop, is an index of user-created Python modules that are available
4343
for download. Once you begin releasing code, you can register it here so that
4444
others can find it.

‎Doc/using/windows.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ The Windows-specific standard modules are documented in
848848
PyWin32
849849
-------
850850

851-
The `PyWin32 <https://pypi.python.org/pypi/pywin32>`_ module by Mark Hammond
851+
The `PyWin32 <https://pypi.org/project/pywin32>`_ module by Mark Hammond
852852
is a collection of modules for advanced Windows-specific support. This includes
853853
utilities for:
854854

‎Doc/whatsnew/2.3.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ The heart of the catalog is the new Distutils :command:`register` command.
659659
Running ``python setup.py register`` will collect the metadata describing a
660660
package, such as its name, version, maintainer, description, &c., and send it to
661661
a central catalog server. The resulting catalog is available from
662-
https://pypi.python.org/pypi.
662+
https://pypi.org.
663663

664664
To make the catalog a bit more useful, a new optional *classifiers* keyword
665665
argument has been added to the Distutils :func:`setup` function. A list of

‎Doc/whatsnew/2.5.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ required packages. ::
229229
)
230230

231231
Another new enhancement to the Python package index at
232-
https://pypi.python.org is storing source and binary archives for a
232+
https://pypi.org is storing source and binary archives for a
233233
package. The new :command:`upload` Distutils command will upload a package to
234234
the repository.
235235

‎Doc/whatsnew/2.7.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ new features were added. Most of these features were implemented
18281828
by Michael Foord, unless otherwise noted. The enhanced version of
18291829
the module is downloadable separately for use with Python versions 2.4 to 2.6,
18301830
packaged as the :mod:`unittest2` package, from
1831-
https://pypi.python.org/pypi/unittest2.
1831+
https://pypi.org/project/unittest2.
18321832

18331833
When used from the command line, the module can automatically discover
18341834
tests. It's not as fancy as `py.test <http://pytest.org>`__ or

‎Doc/whatsnew/3.5.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ New :class:`~collections.abc.Awaitable`, :class:`~collections.abc.Coroutine`,
951951
(Contributed by Yury Selivanov in :issue:`24184`.)
952952

953953
For earlier Python versions, a backport of the new ABCs is available in an
954-
external `PyPI package <https://pypi.python.org/pypi/backports_abc>`_.
954+
external `PyPI package <https://pypi.org/project/backports_abc>`_.
955955

956956

957957
compileall

‎Misc/NEWS.d/next/Documentation/2018-05-14-20-08-58.bpo-33503.Wvt0qg.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix broken pypi link

0 commit comments

Comments
 (0)