1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.2

Browse Source
This commit is contained in:
Éric Araujo 2011-06-01 19:47:24 +02:00
commit 5397c797f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/distutils/apiref.rst
View File

@ -1814,7 +1814,7 @@ Subclasses of :class:`Command` must define the following methods.
.. module:: distutils.command.bdist_msi .. module:: distutils.command.bdist_msi
:synopsis: Build a binary distribution as a Windows MSI file :synopsis: Build a binary distribution as a Windows MSI file
.. class:: bdist_msi(Command) .. class:: bdist_msi
Builds a `Windows Installer`_ (.msi) binary package. Builds a `Windows Installer`_ (.msi) binary package.
@ -1893,9 +1893,9 @@ Subclasses of :class:`Command` must define the following methods.
:synopsis: Build the .py/.pyc files of a package :synopsis: Build the .py/.pyc files of a package
.. class:: build_py(Command) .. class:: build_py
.. class:: build_py_2to3(build_py) .. class:: build_py_2to3
Alternative implementation of build_py which also runs the Alternative implementation of build_py which also runs the
2to3 conversion library on each .py file that is going to be 2to3 conversion library on each .py file that is going to be

2
Modules/_threadmodule.c
View File

@ -1098,7 +1098,7 @@ thread_PyThread_exit_thread(PyObject *self)
PyDoc_STRVAR(exit_doc, PyDoc_STRVAR(exit_doc,
"exit()\n\ "exit()\n\
(PyThread_exit_thread() is an obsolete synonym)\n\ (exit_thread() is an obsolete synonym)\n\
\n\ \n\
This is synonymous to ``raise SystemExit''. It will cause the current\n\ This is synonymous to ``raise SystemExit''. It will cause the current\n\
thread to exit silently unless the exception is caught."); thread to exit silently unless the exception is caught.");