mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge with 3.4

Browse source
This commit is contained in:
Georg Brandl 2014-10-29 08:37:29 +01:00
commit cadc3fdcb5
59 changed files with 208 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/distutils/apiref.rst
View file

@ -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 | <http://pypi.python.org/pypi?:action=list_classifiers>`_. |
| | package | <https://pypi.python.org/pypi?:action=list_classifiers>`_. |
+--------------------+--------------------------------+-------------------------------------------------------------+
| *distclass* | the :class:`Distribution` | a subclass of |
| | class to use | :class:`distutils.core.Distribution` |

2
Doc/distutils/examples.rst
View file

@ -11,7 +11,7 @@ Distutils Cookbook.
.. seealso::
`Distutils Cookbook <http://wiki.python.org/moin/Distutils/Cookbook>`_
`Distutils Cookbook <https://wiki.python.org/moin/Distutils/Cookbook>`_
Collection of recipes showing how to achieve more control over distutils.

4
Doc/distutils/setupscript.rst
View file

@ -28,7 +28,7 @@ the package into Python 1.5.2.) ::
description='Python Distribution Utilities',
author='Greg Ward',
author_email='gward@python.net',
url='http://www.python.org/sigs/distutils-sig/',
url='https://www.python.org/sigs/distutils-sig/',
packages=['distutils', 'distutils.command'],
)
@ -609,7 +609,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
<http://pypi.python.org/pypi>`_.
<https://pypi.python.org/pypi>`_.
(5)
The ``long_description`` field is used by PyPI when you are