[2.7] bpo-33503: Fix the broken pypi link in the source and the docum… · python/cpython@ad65d09 (original) (raw)

26 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ Building the docs
15 15
16 16 You need to have Sphinx http://sphinx-doc.org/ installed; it is the toolset
17 17 used to build the docs. It is not included in this tree, but maintained
18 -separately and available from PyPI https://pypi.python.org/pypi/Sphinx.
18 +separately and available from PyPI https://pypi.org/project/Sphinx.
19 19
20 20
21 21 Using make
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ installing other Python projects, refer to the
31 31 Key terms
32 32 =========
33 33
34 -* the `Python Packaging Index https://pypi.python.org/pypi\`__ is a public
34 +* the `Python Packaging Index https://pypi.org\`__ is a public
35 35 repository of open source licensed packages made available for use by
36 36 other Python users
37 37 * the `Python Packaging Authority

| Original file line number | Diff line number | Diff line change | | | | | --------------------------------------------------------------------------------------------------- | ---------------- | --------------------------------------------------------------------------------------------------------------------- | ------------------------------------ | -------------------------------------------------------------- | | | @@ -78,7 +78,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and | | | | | | | 78 | 78 | | | be built | :class:`distutils.core.Extension` | | | 79 | 79 | +--------------------+--------------------------------+-------------------------------------------------------------+ | | | | | 80 | 80 | | *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\`_. | | | | 82 | 82 | +--------------------+--------------------------------+-------------------------------------------------------------+ | | | | | 83 | 83 | | *distclass* | the :class:`Distribution` | a subclass of | | | 84 | 84 | | | class to use | :class:`distutils.core.Distribution` | |

Original file line number Diff line number Diff line change
@@ -248,4 +248,4 @@ without warnings does not guarantee that PyPI will convert the content
248 248 successfully.
249 249
250 250
251 -.. _Python Package Index (PyPI): https://pypi.python.org/pypi
251 +.. _Python Package Index (PyPI): https://pypi.org
Original file line number Diff line number Diff line change
@@ -606,7 +606,7 @@ Notes:
606 606 (4)
607 607 These fields should not be used if your package is to be compatible with Python
608 608 versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website
609 -https://pypi.python.org/pypi\`_.
609 +https://pypi.org`_.
610 610
611 611 (5)
612 612 The ``long_description`` field is used by PyPI when you are
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ programming), software engineering (unit testing, logging, profiling, parsing
117 117 Python code), and operating system interfaces (system calls, filesystems, TCP/IP
118 118 sockets). Look at the table of contents for :ref:`library-index` to get an idea
119 119 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
121 121 find packages of interest to you.
122 122
123 123
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ standard library module. (Eventually you'll learn what's in the standard
19 19 library and will be able to skip this step.)
20 20
21 21 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
23 23 another Web search engine. Searching for "Python" plus a keyword or two for
24 24 your topic of interest will usually find something helpful.
25 25
@@ -585,7 +585,7 @@ substituted for standard input and output. You will have to use pseudo ttys
585 585 ("ptys") instead of pipes. Or you can use a Python interface to Don Libes'
586 586 "expect" library. A Python extension that interfaces to expect is called "expy"
587 587 and available from http://expectpy.sourceforge.net. A pure Python solution that
588 -works like expect is `pexpect https://pypi.python.org/pypi/pexpect/\`_.
588 +works like expect is `pexpect https://pypi.org/project/pexpect/\`_.
589 589
590 590
591 591 How do I access the serial (RS232) port?
Original file line number Diff line number Diff line change
@@ -427,25 +427,25 @@ to make sure everything functions as expected in both versions of Python.
427 427
428 428
429 429 .. _2to3: https://docs.python.org/3/library/2to3.html
430 -.. _caniusepython3: https://pypi.python.org/pypi/caniusepython3
430 +.. _caniusepython3: https://pypi.org/project/caniusepython3
431 431 .. _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
433 433 .. _Futurize: http://python-future.org/automatic\_conversion.html
434 434 .. _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
436 436 .. _Modernize: https://python-modernize.readthedocs.org/en/latest/
437 437 .. _mypy: http://mypy-lang.org/
438 438 .. _Porting to Python 3: http://python3porting.com/
439 -.. _Pylint: https://pypi.python.org/pypi/pylint
439 +.. _Pylint: https://pypi.org/project/pylint
440 440
441 441 .. _Python 3 Q & A: https://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions\_and\_answers.html
442 442
443 443 .. _pytype: https://github.com/google/pytype
444 444 .. _python-future: http://python-future.org/
445 445 .. _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
449 449
450 450 .. _"What's New": https://docs.python.org/3/whatsnew/index.html
451 451
Original file line number Diff line number Diff line change
@@ -301,7 +301,7 @@ following WSGI-application::
301 301 WSGIServer(app).run()
302 302
303 303 This is a simple WSGI application, but you need to install `flup
304 -https://pypi.python.org/pypi/flup/1.0`_ first, as flup handles the low level
304 +https://pypi.org/project/flup/1.0`_ first, as flup handles the low level
305 305 FastCGI access.
306 306
307 307 .. seealso::
@@ -583,7 +583,7 @@ alternate storage mechanism.
583 583 helps with choosing a method for saving data
584 584
585 585 * `SQLAlchemy http://www.sqlalchemy.org/\`_, the most powerful OR-Mapper
586 - for Python, and `Elixir https://pypi.python.org/pypi/Elixir\`_, which makes
586 + for Python, and `Elixir https://pypi.org/project/Elixir\`_, which makes
587 587 SQLAlchemy easier to use
588 588
589 589 * `SQLObject http://www.sqlobject.org/\`_, another popular OR-Mapper
Original file line number Diff line number Diff line change
@@ -39,9 +39,8 @@ Key terms
39 39 being installed system wide
40 40 * ``virtualenv`` is a third party tools for creating virtual environments, it
41 41 is defaults to installing ``pip`` into all created virtual environments.
42 -* the `Python Packaging Index https://pypi.python.org/pypi\`__ is a public
43 - repository of open source licensed packages made available for use by
44 - other Python users
42 +* the `Python Packaging Index https://pypi.org\`__ is a public repository of
43 + open source licensed packages made available for use by other Python users
45 44 * the `Python Packaging Authority
46 45 https://www.pypa.io/en/latest/`__ are the group of
47 46 developers and documentation authors responsible for the maintenance and
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ Handling of compressed files is offered by the :class:`BZ2File` class.
74 74 input file, only the first stream will be accessible. If you require
75 75 support for multi-stream files, consider using the third-party
76 76 :mod:`bz2file` module (available from
77 - `PyPI https://pypi.python.org/pypi/bz2file\`_). This module provides a
77 + `PyPI https://pypi.org/project/bz2file\`_). This module provides a
78 78 backport of Python 3.3's :class:`BZ2File` class, which does support
79 79 multi-stream files.
80 80
Original file line number Diff line number Diff line change
@@ -1566,7 +1566,7 @@ EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
1566 1566
1567 1567 .. seealso::
1568 1568
1569 - `pytz https://pypi.python.org/pypi/pytz/\`_
1569 + `pytz https://pypi.org/project/pytz/\`_
1570 1570 The standard library has no :class:`tzinfo` instances, but
1571 1571 there exists a third-party library which brings the *IANA timezone
1572 1572 database* (also known as the Olson database) to Python: *pytz*.
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ Software Packaging and Distribution
4 4
5 5 These libraries help you with publishing and installing Python software.
6 6 While these modules are designed to work in conjunction with the
7 -`Python Package Index https://pypi.python.org\`__, they can also be used
7 +`Python Package Index https://pypi.org\`__, they can also be used
8 8 with a local index server, or without any index server at all.
9 9
10 10 .. toctree::
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ optional components.
30 30 In addition to the standard library, there is a growing collection of
31 31 several thousand components (from individual programs and modules to
32 32 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\`_.
34 34
35 35
36 36 .. toctree::
Original file line number Diff line number Diff line change
@@ -234,4 +234,3 @@ parameters.
234 234 ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
235 235 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'],
236 236 ['cccccccccccccccccccc', 'dddddddddddddddddddd']]
237 -
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ fine-tuning parameters.
35 35
36 36 .. seealso::
37 37
38 - The third-party `regex https://pypi.python.org/pypi/regex/\`_ module,
38 + The third-party `regex https://pypi.org/project/regex/\`_ module,
39 39 which has an API compatible with the standard library :mod:`re` module,
40 40 but offers additional functionality and a more thorough Unicode support.
41 41
Original file line number Diff line number Diff line change
@@ -1586,7 +1586,7 @@ Visual inspection shows that the certificate does identify the desired service
1586 1586 (('commonName', 'www.python.org'),)),
1587 1587 'subjectAltName': (('DNS', 'www.python.org'),
1588 1588 ('DNS', 'python.org'),
1589 - ('DNS', 'pypi.python.org'),
1589 + ('DNS', 'pypi.org'),
1590 1590 ('DNS', 'docs.python.org'),
1591 1591 ('DNS', 'testpypi.python.org'),
1592 1592 ('DNS', 'bugs.python.org'),
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ functions can be found in the subprocess-replacements_ section.
32 32
33 33 :pep:`324` -- PEP proposing the subprocess module
34 34
35 -.. _subprocess32: https://pypi.python.org/pypi/subprocess32/
35 +.. _subprocess32: https://pypi.org/project/subprocess32/
36 36
37 37 Using the :mod:`subprocess` Module
38 38 ----------------------------------
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ need to derive from a specific class.
78 78 Module :mod:`doctest`
79 79 Another test-support module with a very different flavor.
80 80
81 - `unittest2: A backport of new unittest features for Python 2.4-2.6 https://pypi.python.org/pypi/unittest2\`_
81 + `unittest2: A backport of new unittest features for Python 2.4-2.6 https://pypi.org/project/unittest2\`_
82 82 Many new features were added to unittest in Python 2.7, including test
83 83 discovery. unittest2 allows you to use these features with earlier
84 84 versions of Python.
Original file line number Diff line number Diff line change
@@ -129,8 +129,8 @@ break backward compatibility. After all inline DTD and entity expansion are
129 129 well-defined XML features.
130 130
131 131
132 -.. _defusedxml: https://pypi.python.org/pypi/defusedxml/
133 -.. _defusedexpat: https://pypi.python.org/pypi/defusedexpat/
132 +.. _defusedxml: https://pypi.org/project/defusedxml/
133 +.. _defusedexpat: https://pypi.org/project/defusedexpat/
134 134 .. _Billion Laughs: https://en.wikipedia.org/wiki/Billion\_laughs
135 135 .. _ZIP bomb: https://en.wikipedia.org/wiki/Zip\_bomb
136 136 .. _DTD: https://en.wikipedia.org/wiki/Document\_type\_definition
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ More Python resources:
38 38
39 39 * https://docs.python.org: Fast access to Python's documentation.
40 40
41 -* https://pypi.python.org/pypi: The Python Package Index, previously also nicknamed
41 +* https://pypi.org: The Python Package Index, previously also nicknamed
42 42 the Cheese Shop, is an index of user-created Python modules that are available
43 43 for download. Once you begin releasing code, you can register it here so that
44 44 others can find it.
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ The Windows-specific standard modules are documented in
242 242 PyWin32
243 243 -------
244 244
245 -The `PyWin32 https://pypi.python.org/pypi/pywin32\`_ module by Mark Hammond
245 +The `PyWin32 https://pypi.org/project/pywin32\`_ module by Mark Hammond
246 246 is a collection of modules for advanced Windows-specific support. This includes
247 247 utilities for:
248 248
Original file line number Diff line number Diff line change
@@ -659,7 +659,7 @@ The heart of the catalog is the new Distutils :command:`register` command.
659 659 Running ``python setup.py register`` will collect the metadata describing a
660 660 package, such as its name, version, maintainer, description, &c., and send it to
661 661 a central catalog server. The resulting catalog is available from
662 -https://pypi.python.org/pypi.
662 +https://pypi.org.
663 663
664 664 To make the catalog a bit more useful, a new optional *classifiers* keyword
665 665 argument has been added to the Distutils :func:`setup` function. A list of
Original file line number Diff line number Diff line change
@@ -229,7 +229,7 @@ required packages. ::
229 229 )
230 230
231 231 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
233 233 package. The new :command:`upload` Distutils command will upload a package to
234 234 the repository.
235 235
Original file line number Diff line number Diff line change
@@ -1809,7 +1809,7 @@ new features were added. Most of these features were implemented
1809 1809 by Michael Foord, unless otherwise noted. The enhanced version of
1810 1810 the module is downloadable separately for use with Python versions 2.4 to 2.6,
1811 1811 packaged as the :mod:`unittest2` package, from
1812 -https://pypi.python.org/pypi/unittest2.
1812 +https://pypi.org/project/unittest2.
1813 1813
1814 1814 When used from the command line, the module can automatically discover
1815 1815 tests. It's not as fancy as `py.test http://pytest.org\`__ or
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +Fix broken pypi link