[Python-checkins] cpython (merge 3.2 -> 3.2): Branch merge
eric.araujo
python-checkins at python.org
Wed Jun 1 19:47:54 CEST 2011
http://hg.python.org/cpython/rev/5e75517696d4
changeset: 70589:5e75517696d4
branch: 3.2
parent: 70575:22457ac2c2df
parent: 70588:12c1182f33bc
user: Éric Araujo <merwok at netwok.org>
date: Wed Jun 01 19:39:27 2011 +0200
summary:
Branch merge
files:
Doc/distutils/apiref.rst | 8 ++++----
Modules/_threadmodule.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1814,7 +1814,7 @@
.. module:: distutils.command.bdist_msi
:synopsis: Build a binary distribution as a Windows MSI file
-.. class:: bdist_msi(Command)
+.. class:: bdist_msi
Builds a `Windows Installer`_ (.msi) binary package.
@@ -1893,9 +1893,9 @@
:synopsis: Build the .py/.pyc files of a package
-.. class:: build_py(Command)
-
-.. class:: build_py_2to3(build_py)
+.. class:: build_py
+
+.. class:: build_py_2to3
Alternative implementation of build_py which also runs the
2to3 conversion library on each .py file that is going to be
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -1091,7 +1091,7 @@
PyDoc_STRVAR(exit_doc,
"exit()\n\
-(PyThread_exit_thread() is an obsolete synonym)\n\
+(exit_thread() is an obsolete synonym)\n\
\n\
This is synonymous to ``raise SystemExit''. It will cause the current\n\
thread to exit silently unless the exception is caught.");
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list