diff options
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/__future__.rst | 2 | ||||
-rw-r--r-- | Doc/library/ctypes.rst | 4 | ||||
-rw-r--r-- | Doc/library/ftplib.rst | 2 | ||||
-rw-r--r-- | Doc/library/functions.rst | 1 | ||||
-rw-r--r-- | Doc/library/gc.rst | 5 | ||||
-rw-r--r-- | Doc/library/multiprocessing.rst | 21 | ||||
-rw-r--r-- | Doc/library/operator.rst | 2 | ||||
-rw-r--r-- | Doc/library/select.rst | 4 | ||||
-rw-r--r-- | Doc/library/stdtypes.rst | 2 | ||||
-rw-r--r-- | Doc/library/string.rst | 2 | ||||
-rw-r--r-- | Doc/library/sys.rst | 13 | ||||
-rw-r--r-- | Doc/library/tkinter.tix.rst | 4 | ||||
-rw-r--r-- | Doc/library/tkinter.turtle.rst | 8 | ||||
-rw-r--r-- | Doc/library/urllib.request.rst | 2 | ||||
-rw-r--r-- | Doc/library/wsgiref.rst | 2 | ||||
-rw-r--r-- | Doc/library/xmlrpc.client.rst | 4 |
16 files changed, 38 insertions, 40 deletions
diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst index e2349cc..d6f82a3 100644 --- a/Doc/library/__future__.rst +++ b/Doc/library/__future__.rst @@ -16,7 +16,7 @@ * To document when incompatible changes were introduced, and when they will be --- or were --- made mandatory. This is a form of executable documentation, and - can be inspected programatically via importing :mod:`__future__` and examining + can be inspected programmatically via importing :mod:`__future__` and examining its contents. Each statement in :file:`__future__.py` is of the form:: diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 939bf8f..f422bf3 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1781,8 +1781,8 @@ Utility functions .. function:: byref(obj[, offset]) Returns a light-weight pointer to ``obj``, which must be an - instance of a ctypes type. ``offset`` defaults to zero, it must be - an integer which is added to the internal pointer value. + instance of a ctypes type. ``offset`` defaults to zero, and must be + an integer that will be added to the internal pointer value. ``byref(obj, offset)`` corresponds to this C code:: diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index f360c60..d4f8888 100644 --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -300,7 +300,7 @@ followed by ``lines`` for the text version or ``binary`` for the binary version. Send a ``QUIT`` command to the server and close the connection. This is the "polite" way to close a connection, but it may raise an exception of the server - reponds with an error to the ``QUIT`` command. This implies a call to the + responds with an error to the ``QUIT`` command. This implies a call to the :meth:`close` method which renders the :class:`FTP` instance useless for subsequent calls (see below). diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 4b1cbc6..ac40ce7 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1186,6 +1186,7 @@ are always available. They are listed here in alphabetical order. care about trailing, unmatched values from the longer iterables. If those values are important, use :func:`itertools.zip_longest` instead. + .. rubric:: Footnotes .. [#] Specifying a buffer size currently has no effect on systems that don't have diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst index 99504c6..7c425e3 100644 --- a/Doc/library/gc.rst +++ b/Doc/library/gc.rst @@ -44,6 +44,11 @@ The :mod:`gc` module provides the following functions: :exc:`ValueError` is raised if the generation number is invalid. The number of unreachable objects found is returned. + The free lists maintained for a number of builtin types are cleared + whenever a full collection or collection of the highest generation (2) + is run. Not all items in some free lists may be freed due to the + particular implementation, in particular :class:`float`. + .. function:: set_debug(flags) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index be87775..10ccb17 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -158,7 +158,7 @@ However, if you really do need to use some shared data then The ``'d'`` and ``'i'`` arguments used when creating ``num`` and ``arr`` are typecodes of the kind used by the :mod:`array` module: ``'d'`` indicates a - double precision float and ``'i'`` inidicates a signed integer. These shared + double precision float and ``'i'`` indicates a signed integer. These shared objects will be process and thread safe. For more flexibility in using shared memory one can use the @@ -168,7 +168,7 @@ However, if you really do need to use some shared data then **Server process** A manager object returned by :func:`Manager` controls a server process which - holds python objects and allows other processes to manipulate them using + holds Python objects and allows other processes to manipulate them using proxies. A manager returned by :func:`Manager` will support types :class:`list`, @@ -451,7 +451,7 @@ Note that one can also create a shared queue by using a manager object -- see This means that if you try joining that process you may get a deadlock unless you are sure that all items which have been put on the queue have been consumed. Similarly, if the child process is non-daemonic then the parent - process may hang on exit when it tries to join all it non-daemonic children. + process may hang on exit when it tries to join all its non-daemonic children. Note that a queue created using a manager does not have this issue. See :ref:`multiprocessing-programming`. @@ -532,7 +532,8 @@ For an example of the usage of queues for interprocess communication see Equivalent to ``get(False)``. :class:`multiprocessing.Queue` has a few additional methods not found in - :class:`queue.Queue` which are usually unnecessary: + :class:`queue.Queue`. These methods are usually unnecessary for most + code: .. method:: close() @@ -772,7 +773,7 @@ Synchronization primitives ~~~~~~~~~~~~~~~~~~~~~~~~~~ Generally synchronization primitives are not as necessary in a multiprocess -program as they are in a mulithreaded program. See the documentation for +program as they are in a multithreaded program. See the documentation for :mod:`threading` module. Note that one can also create synchronization primitives by using a manager @@ -782,7 +783,7 @@ object -- see :ref:`multiprocessing-managers`. A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`. - (On Mac OSX this is indistiguishable from :class:`Semaphore` because + (On Mac OSX this is indistinguishable from :class:`Semaphore` because ``sem_getvalue()`` is not implemented on that platform). .. class:: Condition([lock]) @@ -891,8 +892,8 @@ processes. .. note:: - Although it is posible to store a pointer in shared memory remember that this - will refer to a location in the address space of a specific process. + Although it is possible to store a pointer in shared memory remember that + this will refer to a location in the address space of a specific process. However, the pointer is quite likely to be invalid in the context of a second process and trying to dereference the pointer from the second process may cause a crash. @@ -1081,7 +1082,7 @@ their parent process exits. The manager classes are defined in the Start a subprocess to start the manager. - .. method:: server_forever() + .. method:: serve_forever() Run the server in the current process. @@ -1774,7 +1775,7 @@ handler type) for messages from different processes to get mixed up. handler which sends output to :data:`sys.stderr` using format ``'[%(levelname)s/%(processName)s] %(message)s'``. (The logger allows use of the non-standard ``'%(processName)s'`` format.) Message sent to this logger - will not by default propogate to the root logger. + will not by default propagate to the root logger. Note that on Windows child processes will only inherit the level of the parent process's logger -- any other customization of the logger will not be diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst index 37996e0..a67c6d8 100644 --- a/Doc/library/operator.rst +++ b/Doc/library/operator.rst @@ -513,7 +513,7 @@ Python syntax and the functions in the :mod:`operator` module. +-----------------------+-------------------------+---------------------------------+ | Right Shift | ``a >> b`` | ``rshift(a, b)`` | +-----------------------+-------------------------+---------------------------------+ -| Sequence Repitition | ``seq * i`` | ``repeat(seq, i)`` | +| Sequence Repetition | ``seq * i`` | ``repeat(seq, i)`` | +-----------------------+-------------------------+---------------------------------+ | String Formatting | ``s % obj`` | ``mod(s, obj)`` | +-----------------------+-------------------------+---------------------------------+ diff --git a/Doc/library/select.rst b/Doc/library/select.rst index 102d3ea..f64d6dd 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -330,7 +330,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 +---------------------------+---------------------------------------------+ | :const:`KQ_EV_DISABLE` | Disablesevent | +---------------------------+---------------------------------------------+ - | :const:`KQ_EV_ONESHOT` | Removes event after first occurence | + | :const:`KQ_EV_ONESHOT` | Removes event after first occurrence | +---------------------------+---------------------------------------------+ | :const:`KQ_EV_CLEAR` | Reset the state after an event is retrieved | +---------------------------+---------------------------------------------+ @@ -365,7 +365,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 +============================+============================================+ | :const:`KQ_NOTE_DELETE` | *unlink()* was called | +----------------------------+--------------------------------------------+ - | :const:`KQ_NOTE_WRITE` | a write occured | + | :const:`KQ_NOTE_WRITE` | a write occurred | +----------------------------+--------------------------------------------+ | :const:`KQ_NOTE_EXTEND` | the file was extended | +----------------------------+--------------------------------------------+ diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 586770a..40417d8 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1565,7 +1565,7 @@ The constructors for both classes work the same: .. method:: isdisjoint(other) Return True if the set has no elements in common with *other*. Sets are - disjoint if and only if their interesection is the empty set. + disjoint if and only if their intersection is the empty set. .. method:: issubset(other) set <= other diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 662541e..07a2c4b 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -266,7 +266,7 @@ Then the outer replacement field would be evaluated, producing:: "noses " -Which is subsitituted into the string, yielding:: +Which is substituted into the string, yielding:: "A man with two noses " diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index f92b1e4..3f73ec2 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -54,19 +54,6 @@ always available. A string containing the copyright pertaining to the Python interpreter. -.. function:: _compact_freelists() - - Compact the free list of floats by deallocating unused blocks. - It can reduce the memory usage of the Python process several tenth of - thousands of integers or floats have been allocated at once. - - The return value is a tuple of tuples each containing three elements, - amount of used objects, total block count before the blocks are deallocated - and amount of freed blocks. - - This function should be used for specialized purposes only. - - .. function:: _clear_type_cache() Clear the internal type cache. The type cache is used to speed up attribute diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst index a85aeb1..b555376 100644 --- a/Doc/library/tkinter.tix.rst +++ b/Doc/library/tkinter.tix.rst @@ -305,8 +305,8 @@ File Selectors .. \ulink{FileEntry}{http://tix.sourceforge.net/dist/current/demos/samples/FileEnt.tcl} -Hierachical ListBox -^^^^^^^^^^^^^^^^^^^ +Hierarchical ListBox +^^^^^^^^^^^^^^^^^^^^ .. class:: HList() diff --git a/Doc/library/tkinter.turtle.rst b/Doc/library/tkinter.turtle.rst index 575c2fc..6bf9c10 100644 --- a/Doc/library/tkinter.turtle.rst +++ b/Doc/library/tkinter.turtle.rst @@ -2,6 +2,10 @@ :mod:`turtle` --- Turtle graphics for Tk ======================================== +.. module:: tkinter.turtle + :synopsis: Turtle graphics for Tk +.. sectionauthor:: Gregor Lingl <gregor.lingl@aon.at> + Introduction ============ @@ -1251,7 +1255,7 @@ Window control ... left(10) ... >>> for _ in range(8): - ... left(45); fd(2) # a regular octogon + ... left(45); fd(2) # a regular octagon Animation control @@ -1262,7 +1266,7 @@ Animation control :param delay: positive integer Set or return the drawing *delay* in milliseconds. (This is approximately - the time interval between two consecutived canvas updates.) The longer the + the time interval between two consecutive canvas updates.) The longer the drawing delay, the slower the animation. Optional argument: diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index c506829..3038588 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -1062,7 +1062,7 @@ involved. For example, the :envvar:`http_proxy` environment variable is read to obtain the HTTP proxy's URL. This example replaces the default :class:`ProxyHandler` with one that uses -programatically-supplied proxy URLs, and adds proxy authorization support with +programmatically-supplied proxy URLs, and adds proxy authorization support with :class:`ProxyBasicAuthHandler`. :: proxy_handler = urllib.request.ProxyHandler({'http': 'http://www.example.com:3128/'}) diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst index 70064fc..fcfe769 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -413,7 +413,7 @@ Paste" library. from wsgiref.validate import validator from wsgiref.simple_server import make_server - # Our callable object which is intentionally not compilant to the + # Our callable object which is intentionally not compliant to the # standard, so the validator is going to break def simple_app(environ, start_response): status = '200 OK' # HTTP Status diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst index e249b12..1f18810 100644 --- a/Doc/library/xmlrpc.client.rst +++ b/Doc/library/xmlrpc.client.rst @@ -344,7 +344,7 @@ The client code for the preceding server:: try: proxy.add(2, 5) except xmlrpc.client.Fault, err: - print("A fault occured") + print("A fault occurred") print("Fault code: %d" % err.faultCode) print("Fault string: %s" % err.faultString) @@ -391,7 +391,7 @@ by providing an invalid URI:: try: proxy.some_method() except xmlrpc.client.ProtocolError, err: - print("A protocol error occured") + print("A protocol error occurred") print("URL: %s" % err.url) print("HTTP/HTTPS headers: %s" % err.headers) print("Error code: %d" % err.errcode) |