Merge 3.2

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

View file

@ -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.");