[Python-checkins] cpython (merge 2.7 -> 2.7): Branch merge

Wed Jun 1 19:30:00 CEST 2011

http://hg.python.org/cpython/rev/3e445ceee4f5
changeset: 70580:3e445ceee4f5
branch: 2.7
parent: 70565:8919caab6995
parent: 70579:d4ae796efebb
user: Éric Araujo <merwok at netwok.org>
date: Wed Jun 01 19:28:26 2011 +0200
summary:
 Branch merge
files:
 Doc/distutils/apiref.rst | 2 +-
 Modules/threadmodule.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1815,7 +1815,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.
 
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -715,7 +715,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
