http://hg.python.org/cpython/rev/43b10c2d2553
changeset: 74208:43b10c2d2553
user: Sandro Tosi <sandro.tosi(a)gmail.com>
date: Sat Dec 31 12:59:08 2011 +0100
summary:
fix Exemples/Examples typo; thanks to Ori Livneh from docs@
files:
Doc/library/packaging.pypi.simple.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/library/packaging.pypi.simple.rst b/Doc/library/packaging.pypi.simple.rst
--- a/Doc/library/packaging.pypi.simple.rst
+++ b/Doc/library/packaging.pypi.simple.rst
@@ -89,7 +89,7 @@
-Usage Exemples
+Usage Examples
---------------
To help you understand how using the `Crawler` class, here are some basic
--
Repository URL: http://hg.python.org/cpython
http://hg.python.org/cpython/rev/73481bd9ca54
changeset: 74207:73481bd9ca54
parent: 74205:dbd3013c2685
parent: 74206:2c3a769089d5
user: Eli Bendersky <eliben(a)gmail.com>
date: Sat Dec 31 07:22:27 2011 +0200
summary:
Some formatting & grammar fixes for the multiprocessing doc
files:
Doc/library/multiprocessing.rst | 28 ++++++++++----------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -491,7 +491,7 @@
If you use :class:`JoinableQueue` then you **must** call
:meth:`JoinableQueue.task_done` for each task removed from the queue or else the
-semaphore used to count the number of unfinished tasks may eventually overflow
+semaphore used to count the number of unfinished tasks may eventually overflow,
raising an exception.
Note that one can also create a shared queue by using a manager object -- see
@@ -509,7 +509,7 @@
If a process is killed using :meth:`Process.terminate` or :func:`os.kill`
while it is trying to use a :class:`Queue`, then the data in the queue is
- likely to become corrupted. This may cause any other processes to get an
+ likely to become corrupted. This may cause any other process to get an
exception when it tries to use the queue later on.
.. warning::
@@ -711,7 +711,7 @@
(By default :data:`sys.executable` is used). Embedders will probably need to
do some thing like ::
- setExecutable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
+ set_executable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
before they can create child processes. (Windows only)
@@ -730,7 +730,7 @@
Connection objects allow the sending and receiving of picklable objects or
strings. They can be thought of as message oriented connected sockets.
-Connection objects usually created using :func:`Pipe` -- see also
+Connection objects are usually created using :func:`Pipe` -- see also
:ref:`multiprocessing-listeners-clients`.
.. class:: Connection
@@ -751,7 +751,7 @@
.. method:: fileno()
- Returns the file descriptor or handle used by the connection.
+ Return the file descriptor or handle used by the connection.
.. method:: close()
@@ -775,7 +775,7 @@
If *offset* is given then data is read from that position in *buffer*. If
*size* is given then that many bytes will be read from buffer. Very large
buffers (approximately 32 MB+, though it depends on the OS) may raise a
- ValueError exception
+ :exc:`ValueError` exception
.. method:: recv_bytes([maxlength])
@@ -1353,7 +1353,7 @@
>>>>>>>>>>>>>>>>>>>
To create one's own manager, one creates a subclass of :class:`BaseManager` and
-use the :meth:`~BaseManager.register` classmethod to register new types or
+uses the :meth:`~BaseManager.register` classmethod to register new types or
callables with the manager class. For example::
from multiprocessing.managers import BaseManager
@@ -1604,9 +1604,9 @@
.. method:: apply(func[, args[, kwds]])
Call *func* with arguments *args* and keyword arguments *kwds*. It blocks
- till the result is ready. Given this blocks, :meth:`apply_async` is better
- suited for performing work in parallel. Additionally, the passed in
- function is only executed in one of the workers of the pool.
+ until the result is ready. Given this blocks, :meth:`apply_async` is
+ better suited for performing work in parallel. Additionally, *func*
+ is only executed in one of the workers of the pool.
.. method:: apply_async(func[, args[, kwds[, callback[, error_callback]]]])
@@ -1627,7 +1627,7 @@
.. method:: map(func, iterable[, chunksize])
A parallel equivalent of the :func:`map` built-in function (it supports only
- one *iterable* argument though). It blocks till the result is ready.
+ one *iterable* argument though). It blocks until the result is ready.
This method chops the iterable into a number of chunks which it submits to
the process pool as separate tasks. The (approximate) size of these
@@ -2102,7 +2102,7 @@
On Windows many types from :mod:`multiprocessing` need to be picklable so
that child processes can use them. However, one should generally avoid
sending shared objects to other processes using pipes or queues. Instead
- you should arrange the program so that a process which need access to a
+ you should arrange the program so that a process which needs access to a
shared resource created elsewhere can inherit it from an ancestor process.
Avoid terminating processes
@@ -2181,7 +2181,7 @@
for i in range(10):
Process(target=f, args=(lock,)).start()
-Beware replacing sys.stdin with a "file like object"
+Beware of replacing :data:`sys.stdin` with a "file like object"
:mod:`multiprocessing` originally unconditionally called::
@@ -2299,7 +2299,7 @@
An example showing how to use queues to feed tasks to a collection of worker
-process and collect the results:
+processes and collect the results:
.. literalinclude:: ../includes/mp_workers.py
--
Repository URL: http://hg.python.org/cpython
http://hg.python.org/cpython/rev/2c3a769089d5
changeset: 74206:2c3a769089d5
branch: 3.2
parent: 74204:ce349e1f923e
user: Eli Bendersky <eliben(a)gmail.com>
date: Sat Dec 31 07:20:26 2011 +0200
summary:
Some formatting & grammar fixes for the multiprocessing doc
files:
Doc/library/multiprocessing.rst | 28 ++++++++++----------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -472,7 +472,7 @@
If you use :class:`JoinableQueue` then you **must** call
:meth:`JoinableQueue.task_done` for each task removed from the queue or else the
-semaphore used to count the number of unfinished tasks may eventually overflow
+semaphore used to count the number of unfinished tasks may eventually overflow,
raising an exception.
Note that one can also create a shared queue by using a manager object -- see
@@ -490,7 +490,7 @@
If a process is killed using :meth:`Process.terminate` or :func:`os.kill`
while it is trying to use a :class:`Queue`, then the data in the queue is
- likely to become corrupted. This may cause any other processes to get an
+ likely to become corrupted. This may cause any other process to get an
exception when it tries to use the queue later on.
.. warning::
@@ -692,7 +692,7 @@
(By default :data:`sys.executable` is used). Embedders will probably need to
do some thing like ::
- setExecutable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
+ set_executable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
before they can create child processes. (Windows only)
@@ -711,7 +711,7 @@
Connection objects allow the sending and receiving of picklable objects or
strings. They can be thought of as message oriented connected sockets.
-Connection objects usually created using :func:`Pipe` -- see also
+Connection objects are usually created using :func:`Pipe` -- see also
:ref:`multiprocessing-listeners-clients`.
.. class:: Connection
@@ -732,7 +732,7 @@
.. method:: fileno()
- Returns the file descriptor or handle used by the connection.
+ Return the file descriptor or handle used by the connection.
.. method:: close()
@@ -756,7 +756,7 @@
If *offset* is given then data is read from that position in *buffer*. If
*size* is given then that many bytes will be read from buffer. Very large
buffers (approximately 32 MB+, though it depends on the OS) may raise a
- ValueError exception
+ :exc:`ValueError` exception
.. method:: recv_bytes([maxlength])
@@ -1329,7 +1329,7 @@
>>>>>>>>>>>>>>>>>>>
To create one's own manager, one creates a subclass of :class:`BaseManager` and
-use the :meth:`~BaseManager.register` classmethod to register new types or
+uses the :meth:`~BaseManager.register` classmethod to register new types or
callables with the manager class. For example::
from multiprocessing.managers import BaseManager
@@ -1580,9 +1580,9 @@
.. method:: apply(func[, args[, kwds]])
Call *func* with arguments *args* and keyword arguments *kwds*. It blocks
- till the result is ready. Given this blocks, :meth:`apply_async` is better
- suited for performing work in parallel. Additionally, the passed in
- function is only executed in one of the workers of the pool.
+ until the result is ready. Given this blocks, :meth:`apply_async` is
+ better suited for performing work in parallel. Additionally, *func*
+ is only executed in one of the workers of the pool.
.. method:: apply_async(func[, args[, kwds[, callback[, error_callback]]]])
@@ -1603,7 +1603,7 @@
.. method:: map(func, iterable[, chunksize])
A parallel equivalent of the :func:`map` built-in function (it supports only
- one *iterable* argument though). It blocks till the result is ready.
+ one *iterable* argument though). It blocks until the result is ready.
This method chops the iterable into a number of chunks which it submits to
the process pool as separate tasks. The (approximate) size of these
@@ -2060,7 +2060,7 @@
On Windows many types from :mod:`multiprocessing` need to be picklable so
that child processes can use them. However, one should generally avoid
sending shared objects to other processes using pipes or queues. Instead
- you should arrange the program so that a process which need access to a
+ you should arrange the program so that a process which needs access to a
shared resource created elsewhere can inherit it from an ancestor process.
Avoid terminating processes
@@ -2139,7 +2139,7 @@
for i in range(10):
Process(target=f, args=(lock,)).start()
-Beware replacing sys.stdin with a "file like object"
+Beware of replacing :data:`sys.stdin` with a "file like object"
:mod:`multiprocessing` originally unconditionally called::
@@ -2257,7 +2257,7 @@
An example showing how to use queues to feed tasks to a collection of worker
-process and collect the results:
+processes and collect the results:
.. literalinclude:: ../includes/mp_workers.py
--
Repository URL: http://hg.python.org/cpython
http://hg.python.org/cpython/rev/ce349e1f923e
changeset: 74204:ce349e1f923e
branch: 3.2
parent: 74201:cd30304713ae
user: Benjamin Peterson <benjamin(a)python.org>
date: Fri Dec 30 23:08:09 2011 -0600
summary:
indicate msg is an argument
files:
Doc/library/smtplib.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -281,10 +281,10 @@
envelope used by the transport agents. ``sendmail`` does not modify the
message headers in any way.
- msg may be a string containing characters in the ASCII range, or a byte
+ *msg* may be a string containing characters in the ASCII range, or a byte
string. A string is encoded to bytes using the ascii codec, and lone ``\r``
- and ``\n`` characters are converted to ``\r\n`` characters. A byte string
- is not modified.
+ and ``\n`` characters are converted to ``\r\n`` characters. A byte string is
+ not modified.
If there has been no previous ``EHLO`` or ``HELO`` command this session, this
method tries ESMTP ``EHLO`` first. If the server does ESMTP, message size and
--
Repository URL: http://hg.python.org/cpython
http://hg.python.org/cpython/rev/dbd3013c2685
changeset: 74205:dbd3013c2685
parent: 74202:656fa057aa28
parent: 74204:ce349e1f923e
user: Benjamin Peterson <benjamin(a)python.org>
date: Fri Dec 30 23:09:20 2011 -0600
summary:
merge 3.2
files:
Doc/library/smtplib.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -323,10 +323,10 @@
envelope used by the transport agents. ``sendmail`` does not modify the
message headers in any way.
- msg may be a string containing characters in the ASCII range, or a byte
+ *msg* may be a string containing characters in the ASCII range, or a byte
string. A string is encoded to bytes using the ascii codec, and lone ``\r``
- and ``\n`` characters are converted to ``\r\n`` characters. A byte string
- is not modified.
+ and ``\n`` characters are converted to ``\r\n`` characters. A byte string is
+ not modified.
If there has been no previous ``EHLO`` or ``HELO`` command this session, this
method tries ESMTP ``EHLO`` first. If the server does ESMTP, message size and
--
Repository URL: http://hg.python.org/cpython
http://hg.python.org/cpython/rev/fb5ad61a2b35
changeset: 74203:fb5ad61a2b35
branch: 2.7
parent: 74200:5adbc87f1028
user: Eli Bendersky <eliben(a)gmail.com>
date: Sat Dec 31 07:05:12 2011 +0200
summary:
Some formatting & grammar fixes for the multiprocessing doc
files:
Doc/library/multiprocessing.rst | 34 ++++++++++----------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -282,7 +282,7 @@
if __name__ == '__main__':
pool = Pool(processes=4) # start 4 worker processes
- result = pool.apply_async(f, [10]) # evaluate "f(10)" asynchronously
+ result = pool.apply_async(f, [10]) # evaluate "f(10)" asynchronously
print result.get(timeout=1) # prints "100" unless your computer is *very* slow
print pool.map(f, range(10)) # prints "[0, 1, 4,..., 81]"
@@ -472,7 +472,7 @@
If you use :class:`JoinableQueue` then you **must** call
:meth:`JoinableQueue.task_done` for each task removed from the queue or else the
-semaphore used to count the number of unfinished tasks may eventually overflow
+semaphore used to count the number of unfinished tasks may eventually overflow,
raising an exception.
Note that one can also create a shared queue by using a manager object -- see
@@ -490,7 +490,7 @@
If a process is killed using :meth:`Process.terminate` or :func:`os.kill`
while it is trying to use a :class:`Queue`, then the data in the queue is
- likely to become corrupted. This may cause any other processes to get an
+ likely to become corrupted. This may cause any other process to get an
exception when it tries to use the queue later on.
.. warning::
@@ -692,7 +692,7 @@
(By default :data:`sys.executable` is used). Embedders will probably need to
do some thing like ::
- setExecutable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
+ set_executable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
before they can create child processes. (Windows only)
@@ -711,7 +711,7 @@
Connection objects allow the sending and receiving of picklable objects or
strings. They can be thought of as message oriented connected sockets.
-Connection objects usually created using :func:`Pipe` -- see also
+Connection objects are usually created using :func:`Pipe` -- see also
:ref:`multiprocessing-listeners-clients`.
.. class:: Connection
@@ -722,7 +722,7 @@
using :meth:`recv`.
The object must be picklable. Very large pickles (approximately 32 MB+,
- though it depends on the OS) may raise a ValueError exception.
+ though it depends on the OS) may raise a :exc:`ValueError` exception.
.. method:: recv()
@@ -732,7 +732,7 @@
.. method:: fileno()
- Returns the file descriptor or handle used by the connection.
+ Return the file descriptor or handle used by the connection.
.. method:: close()
@@ -756,7 +756,7 @@
If *offset* is given then data is read from that position in *buffer*. If
*size* is given then that many bytes will be read from buffer. Very large
buffers (approximately 32 MB+, though it depends on the OS) may raise a
- ValueError exception
+ :exc:`ValueError` exception
.. method:: recv_bytes([maxlength])
@@ -1329,7 +1329,7 @@
>>>>>>>>>>>>>>>>>>>
To create one's own manager, one creates a subclass of :class:`BaseManager` and
-use the :meth:`~BaseManager.register` classmethod to register new types or
+uses the :meth:`~BaseManager.register` classmethod to register new types or
callables with the manager class. For example::
from multiprocessing.managers import BaseManager
@@ -1579,10 +1579,10 @@
.. method:: apply(func[, args[, kwds]])
- Equivalent of the :func:`apply` built-in function. It blocks till the
- result is ready. Given this blocks, :meth:`apply_async` is better suited
- for performing work in parallel. Additionally, the passed
- in function is only executed in one of the workers of the pool.
+ Equivalent of the :func:`apply` built-in function. It blocks until the
+ result is ready, so :meth:`apply_async` is better suited for performing
+ work in parallel. Additionally, *func* is only executed in one of the
+ workers of the pool.
.. method:: apply_async(func[, args[, kwds[, callback]]])
@@ -1596,7 +1596,7 @@
.. method:: map(func, iterable[, chunksize])
A parallel equivalent of the :func:`map` built-in function (it supports only
- one *iterable* argument though). It blocks till the result is ready.
+ one *iterable* argument though). It blocks until the result is ready.
This method chops the iterable into a number of chunks which it submits to
the process pool as separate tasks. The (approximate) size of these
@@ -2046,7 +2046,7 @@
On Windows many types from :mod:`multiprocessing` need to be picklable so
that child processes can use them. However, one should generally avoid
sending shared objects to other processes using pipes or queues. Instead
- you should arrange the program so that a process which need access to a
+ you should arrange the program so that a process which needs access to a
shared resource created elsewhere can inherit it from an ancestor process.
Avoid terminating processes
@@ -2125,7 +2125,7 @@
for i in range(10):
Process(target=f, args=(lock,)).start()
-Beware replacing sys.stdin with a "file like object"
+Beware of replacing :data:`sys.stdin` with a "file like object"
:mod:`multiprocessing` originally unconditionally called::
@@ -2243,7 +2243,7 @@
An example showing how to use queues to feed tasks to a collection of worker
-process and collect the results:
+processes and collect the results:
.. literalinclude:: ../includes/mp_workers.py
--
Repository URL: http://hg.python.org/cpython
