diff options
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/json.rst | 12 | ||||
| -rw-r--r-- | Doc/library/multiprocessing.rst | 4 | ||||
| -rw-r--r-- | Doc/library/string.rst | 10 | ||||
| -rw-r--r-- | Doc/library/subprocess.rst | 2 | ||||
| -rw-r--r-- | Doc/library/threading.rst | 16 |
5 files changed, 30 insertions, 14 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index e1f5cf2..3b203a2 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -82,12 +82,12 @@ Extending :class:`JSONEncoder`:: ... return [obj.real, obj.imag] ... return json.JSONEncoder.default(self, obj) ... - >>> dumps(2 + 1j, cls=ComplexEncoder) + >>> json.dumps(2 + 1j, cls=ComplexEncoder) '[2.0, 1.0]' >>> ComplexEncoder().encode(2 + 1j) '[2.0, 1.0]' >>> list(ComplexEncoder().iterencode(2 + 1j)) - ['[', '2.0', ', ', '1.0', ']'] + ['[2.0', ', 1.0', ']'] .. highlight:: none @@ -339,7 +339,7 @@ Encoders and decoders encoders and decoders. Otherwise, it will be a :exc:`ValueError` to encode such floats. - If *sort_keys* is ``True`` (the default), then the output of dictionaries + If *sort_keys* is ``True`` (default ``False``), then the output of dictionaries will be sorted by key; this is useful for regression tests to ensure that JSON serializations can be compared on a day-to-day basis. @@ -373,7 +373,7 @@ Encoders and decoders pass else: return list(iterable) - return JSONEncoder.default(self, o) + return json.JSONEncoder.default(self, o) .. method:: encode(o) @@ -381,7 +381,7 @@ Encoders and decoders Return a JSON string representation of a Python data structure, *o*. For example:: - >>> JSONEncoder().encode({"foo": ["bar", "baz"]}) + >>> json.JSONEncoder().encode({"foo": ["bar", "baz"]}) '{"foo": ["bar", "baz"]}' @@ -390,5 +390,5 @@ Encoders and decoders Encode the given object, *o*, and yield each string representation as available. For example:: - for chunk in JSONEncoder().iterencode(bigobject): + for chunk in json.JSONEncoder().iterencode(bigobject): mysocket.write(chunk) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index bd79a3e..27b4c90 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2210,8 +2210,8 @@ Synchronization types like locks, conditions and queues: .. literalinclude:: ../includes/mp_synchronize.py -An showing how to use queues to feed tasks to a collection of worker process and -collect the results: +An example showing how to use queues to feed tasks to a collection of worker +process and collect the results: .. literalinclude:: ../includes/mp_workers.py diff --git a/Doc/library/string.rst b/Doc/library/string.rst index dd04e32..6748484 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -299,11 +299,11 @@ The general form of a *standard format specifier* is: precision: `integer` type: "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%" -The *fill* character can be any character other than '}' (which signifies the -end of the field). The presence of a fill character is signaled by the *next* -character, which must be one of the alignment options. If the second character -of *format_spec* is not a valid alignment option, then it is assumed that both -the fill character and the alignment option are absent. +The *fill* character can be any character other than '{' or '}'. The presence +of a fill character is signaled by the character following it, which must be +one of the alignment options. If the second character of *format_spec* is not +a valid alignment option, then it is assumed that both the fill character and +the alignment option are absent. The meaning of the various alignment options is as follows: diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 3aaa6c6..0c441f8 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -275,7 +275,7 @@ Exceptions Exceptions raised in the child process, before the new program has started to execute, will be re-raised in the parent. Additionally, the exception object will have one extra attribute called :attr:`child_traceback`, which is a string -containing traceback information from the childs point of view. +containing traceback information from the child's point of view. The most common exception raised is :exc:`OSError`. This occurs, for example, when trying to execute a non-existent file. Applications should prepare for diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 68d0304..2e36402 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -33,6 +33,8 @@ This module defines the following functions and objects: variable allows one or more threads to wait until they are notified by another thread. + See :ref:`condition-objects`. + .. function:: current_thread() @@ -58,6 +60,8 @@ This module defines the following functions and objects: with the :meth:`clear` method. The :meth:`wait` method blocks until the flag is true. + See :ref:`event-objects`. + .. class:: local @@ -80,6 +84,8 @@ This module defines the following functions and objects: acquired it, subsequent attempts to acquire it block, until it is released; any thread may release it. + See :ref:`lock-objects`. + .. function:: RLock() @@ -88,6 +94,8 @@ This module defines the following functions and objects: reentrant lock, the same thread may acquire it again without blocking; the thread must release it once for each time it has acquired it. + See :ref:`rlock-objects`. + .. function:: Semaphore(value=1) :noindex: @@ -98,6 +106,8 @@ This module defines the following functions and objects: if necessary until it can return without making the counter negative. If not given, *value* defaults to 1. + See :ref:`semaphore-objects`. + .. function:: BoundedSemaphore(value=1) @@ -109,15 +119,21 @@ This module defines the following functions and objects: .. class:: Thread + :noindex: A class that represents a thread of control. This class can be safely subclassed in a limited fashion. + See :ref:`thread-objects`. + .. class:: Timer + :noindex: A thread that executes a function after a specified interval has passed. + See :ref:`timer-objects`. + .. function:: settrace(func) |