[Python-checkins] cpython (merge 3.2 -> 3.3): #16978: merge with 3.2.
ezio.melotti
python-checkins at python.org
Fri Jan 18 18:59:37 CET 2013
http://hg.python.org/cpython/rev/ad0af795c345
changeset: 81578:ad0af795c345
branch: 3.3
parent: 81574:01c79fb996a3
parent: 81577:4a1a88d25fec
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Jan 18 19:58:47 2013 +0200
summary:
#16978: merge with 3.2.
files:
Doc/library/threading.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -308,10 +308,10 @@
.. impl-detail::
- Due to the :term:`Global Interpreter Lock`, in CPython only one thread
+ In CPython, due to the :term:`Global Interpreter Lock`, only one thread
can execute Python code at once (even though certain performance-oriented
libraries might overcome this limitation).
- If you want your application to make better of use of the computational
+ If you want your application to make better use of the computational
resources of multi-core machines, you are advised to use
:mod:`multiprocessing` or :class:`concurrent.futures.ProcessPoolExecutor`.
However, threading is still an appropriate model if you want to run
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list