summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-01 17:47:24 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-01 17:47:24 (GMT)
commit5397c797f4ca1d958430edff1ff04a91a813a5ec (patch)
treee37e644d66eae96e99c57ee9618904a483dd71eb /Modules
parent98b6592266af5dd8911c90987cf0477c90ec356e (diff)
parentaffcf2967fdf7a2555c2a93d6b0e3def04f607c2 (diff)
downloadcpython-5397c797f4ca1d958430edff1ff04a91a813a5ec.zip
cpython-5397c797f4ca1d958430edff1ff04a91a813a5ec.tar.gz
cpython-5397c797f4ca1d958430edff1ff04a91a813a5ec.tar.bz2
Merge 3.2
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_threadmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 8881427..6e39ca0 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -1098,7 +1098,7 @@ thread_PyThread_exit_thread(PyObject *self)
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.");