mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
fix various doc typos #3320
This commit is contained in:
parent
9c87a40786
commit
90f36730e2
20 changed files with 35 additions and 35 deletions
|
@ -89,15 +89,15 @@ The following functions provide locale-independent string to number conversions.
|
||||||
|
|
||||||
.. cfunction:: char * PyOS_stricmp(char *s1, char *s2)
|
.. cfunction:: char * PyOS_stricmp(char *s1, char *s2)
|
||||||
|
|
||||||
Case insensitive comparsion of strings. The functions works almost
|
Case insensitive comparison of strings. The function works almost
|
||||||
identical to :cfunc:`strcmp` except that it ignores the case.
|
identically to :cfunc:`strcmp` except that it ignores the case.
|
||||||
|
|
||||||
.. versionadded:: 2.6
|
.. versionadded:: 2.6
|
||||||
|
|
||||||
|
|
||||||
.. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t size)
|
.. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t size)
|
||||||
|
|
||||||
Case insensitive comparsion of strings. The functions works almost
|
Case insensitive comparison of strings. The function works almost
|
||||||
identical to :cfunc:`strncmp` except that it ignores the case.
|
identically to :cfunc:`strncmp` except that it ignores the case.
|
||||||
|
|
||||||
.. versionadded:: 2.6
|
.. versionadded:: 2.6
|
||||||
|
|
|
@ -23,7 +23,7 @@ C++.
|
||||||
|
|
||||||
This chapter mentions a number of filenames that include an encoded Python
|
This chapter mentions a number of filenames that include an encoded Python
|
||||||
version number. These filenames are represented with the version number shown
|
version number. These filenames are represented with the version number shown
|
||||||
as ``XY``; in practive, ``'X'`` will be the major version number and ``'Y'``
|
as ``XY``; in practice, ``'X'`` will be the major version number and ``'Y'``
|
||||||
will be the minor version number of the Python release you're working with. For
|
will be the minor version number of the Python release you're working with. For
|
||||||
example, if you are using Python 2.2.1, ``XY`` will actually be ``22``.
|
example, if you are using Python 2.2.1, ``XY`` will actually be ``22``.
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
* To document when incompatible changes were introduced, and when they will be
|
* To document when incompatible changes were introduced, and when they will be
|
||||||
--- or were --- made mandatory. This is a form of executable documentation, and
|
--- 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.
|
its contents.
|
||||||
|
|
||||||
Each statement in :file:`__future__.py` is of the form::
|
Each statement in :file:`__future__.py` is of the form::
|
||||||
|
|
|
@ -316,7 +316,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
|
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
|
"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
|
:meth:`close` method which renders the :class:`FTP` instance useless for
|
||||||
subsequent calls (see below).
|
subsequent calls (see below).
|
||||||
|
|
||||||
|
|
|
@ -1389,7 +1389,7 @@ There are several built-in functions that are no longer essential to learn, know
|
||||||
or use in modern Python programming. They have been kept here to maintain
|
or use in modern Python programming. They have been kept here to maintain
|
||||||
backwards compatibility with programs written for older versions of Python.
|
backwards compatibility with programs written for older versions of Python.
|
||||||
|
|
||||||
Python programmers, trainers, students and bookwriters should feel free to
|
Python programmers, trainers, students and book writers should feel free to
|
||||||
bypass these functions without concerns about missing something important.
|
bypass these functions without concerns about missing something important.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ This is a re-implementation of hierarchical module import.
|
||||||
This code is intended to be read, not executed. However, it does work
|
This code is intended to be read, not executed. However, it does work
|
||||||
-- all you need to do to enable it is "import knee".
|
-- all you need to do to enable it is "import knee".
|
||||||
|
|
||||||
(The name is a pun on the klunkier predecessor of this module, "ni".)
|
(The name is a pun on the clunkier predecessor of this module, "ni".)
|
||||||
|
|
||||||
::
|
::
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ MacPython OSA Modules
|
||||||
*********************
|
*********************
|
||||||
|
|
||||||
This chapter describes the current implementation of the Open Scripting
|
This chapter describes the current implementation of the Open Scripting
|
||||||
Architecure (OSA, also commonly referred to as AppleScript) for Python, allowing
|
Architecture (OSA, also commonly referred to as AppleScript) for Python,
|
||||||
you to control scriptable applications from your Python program, and with a
|
allowing you to control scriptable applications from your Python program,
|
||||||
fairly pythonic interface. Development on this set of modules has stopped, and a
|
and with a fairly pythonic interface. Development on this set of modules has
|
||||||
replacement is expected for Python 2.5.
|
stopped, and a replacement is expected for Python 2.5.
|
||||||
|
|
||||||
For a description of the various components of AppleScript and OSA, and to get
|
For a description of the various components of AppleScript and OSA, and to get
|
||||||
an understanding of the architecture and terminology, you should read Apple's
|
an understanding of the architecture and terminology, you should read Apple's
|
||||||
|
|
|
@ -160,7 +160,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
|
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
|
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.
|
objects will be process and thread safe.
|
||||||
|
|
||||||
For more flexibility in using shared memory one can use the
|
For more flexibility in using shared memory one can use the
|
||||||
|
@ -784,7 +784,7 @@ object -- see :ref:`multiprocessing-managers`.
|
||||||
|
|
||||||
A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`.
|
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).
|
``sem_getvalue()`` is not implemented on that platform).
|
||||||
|
|
||||||
.. class:: Condition([lock])
|
.. class:: Condition([lock])
|
||||||
|
@ -893,8 +893,8 @@ processes.
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
Although it is posible to store a pointer in shared memory remember that this
|
Although it is possible to store a pointer in shared memory remember that
|
||||||
will refer to a location in the address space of a specific process.
|
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
|
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
|
process and trying to dereference the pointer from the second process may
|
||||||
cause a crash.
|
cause a crash.
|
||||||
|
@ -1776,7 +1776,7 @@ handler type) for messages from different processes to get mixed up.
|
||||||
handler which sends output to :data:`sys.stderr` using format
|
handler which sends output to :data:`sys.stderr` using format
|
||||||
``'[%(levelname)s/%(processName)s] %(message)s'``. (The logger allows use of
|
``'[%(levelname)s/%(processName)s] %(message)s'``. (The logger allows use of
|
||||||
the non-standard ``'%(processName)s'`` format.) Message sent to this logger
|
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
|
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
|
parent process's logger -- any other customization of the logger will not be
|
||||||
|
|
|
@ -630,7 +630,7 @@ Python syntax and the functions in the :mod:`operator` module.
|
||||||
+-----------------------+-------------------------+---------------------------------+
|
+-----------------------+-------------------------+---------------------------------+
|
||||||
| Right Shift | ``a >> b`` | ``rshift(a, b)`` |
|
| Right Shift | ``a >> b`` | ``rshift(a, b)`` |
|
||||||
+-----------------------+-------------------------+---------------------------------+
|
+-----------------------+-------------------------+---------------------------------+
|
||||||
| Sequence Repitition | ``seq * i`` | ``repeat(seq, i)`` |
|
| Sequence Repetition | ``seq * i`` | ``repeat(seq, i)`` |
|
||||||
+-----------------------+-------------------------+---------------------------------+
|
+-----------------------+-------------------------+---------------------------------+
|
||||||
| Slice Assignment | ``seq[i:j] = values`` | ``setslice(seq, i, j, values)`` |
|
| Slice Assignment | ``seq[i:j] = values`` | ``setslice(seq, i, j, values)`` |
|
||||||
+-----------------------+-------------------------+---------------------------------+
|
+-----------------------+-------------------------+---------------------------------+
|
||||||
|
|
|
@ -338,7 +338,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
|
||||||
+---------------------------+---------------------------------------------+
|
+---------------------------+---------------------------------------------+
|
||||||
| :const:`KQ_EV_DISABLE` | Disablesevent |
|
| :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 |
|
| :const:`KQ_EV_CLEAR` | Reset the state after an event is retrieved |
|
||||||
+---------------------------+---------------------------------------------+
|
+---------------------------+---------------------------------------------+
|
||||||
|
@ -373,7 +373,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
|
||||||
+============================+============================================+
|
+============================+============================================+
|
||||||
| :const:`KQ_NOTE_DELETE` | *unlink()* was called |
|
| :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 |
|
| :const:`KQ_NOTE_EXTEND` | the file was extended |
|
||||||
+----------------------------+--------------------------------------------+
|
+----------------------------+--------------------------------------------+
|
||||||
|
|
|
@ -1543,7 +1543,7 @@ The constructors for both classes work the same:
|
||||||
.. method:: isdisjoint(other)
|
.. method:: isdisjoint(other)
|
||||||
|
|
||||||
Return True if the set has no elements in common with *other*. Sets are
|
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.
|
||||||
|
|
||||||
.. versionadded:: 2.6
|
.. versionadded:: 2.6
|
||||||
|
|
||||||
|
|
|
@ -293,7 +293,7 @@ Then the outer replacement field would be evaluated, producing::
|
||||||
|
|
||||||
"noses "
|
"noses "
|
||||||
|
|
||||||
Which is subsitituted into the string, yielding::
|
Which is substituted into the string, yielding::
|
||||||
|
|
||||||
"A man with two noses "
|
"A man with two noses "
|
||||||
|
|
||||||
|
|
|
@ -310,8 +310,8 @@ File Selectors
|
||||||
.. \ulink{FileEntry}{http://tix.sourceforge.net/dist/current/demos/samples/FileEnt.tcl}
|
.. \ulink{FileEntry}{http://tix.sourceforge.net/dist/current/demos/samples/FileEnt.tcl}
|
||||||
|
|
||||||
|
|
||||||
Hierachical ListBox
|
Hierarchical ListBox
|
||||||
^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
|
||||||
.. class:: HList()
|
.. class:: HList()
|
||||||
|
|
|
@ -1275,7 +1275,7 @@ Window control
|
||||||
... left(10)
|
... left(10)
|
||||||
...
|
...
|
||||||
>>> for _ in range(8):
|
>>> for _ in range(8):
|
||||||
... left(45); fd(2) # a regular octogon
|
... left(45); fd(2) # a regular octagon
|
||||||
|
|
||||||
|
|
||||||
Animation control
|
Animation control
|
||||||
|
@ -1286,7 +1286,7 @@ Animation control
|
||||||
:param delay: positive integer
|
:param delay: positive integer
|
||||||
|
|
||||||
Set or return the drawing *delay* in milliseconds. (This is approximately
|
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.
|
drawing delay, the slower the animation.
|
||||||
|
|
||||||
Optional argument:
|
Optional argument:
|
||||||
|
|
|
@ -923,7 +923,7 @@ involved. For example, the :envvar:`http_proxy` environment variable is read to
|
||||||
obtain the HTTP proxy's URL.
|
obtain the HTTP proxy's URL.
|
||||||
|
|
||||||
This example replaces the default :class:`ProxyHandler` with one that uses
|
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`. ::
|
:class:`ProxyBasicAuthHandler`. ::
|
||||||
|
|
||||||
proxy_handler = urllib2.ProxyHandler({'http': 'http://www.example.com:3128/'})
|
proxy_handler = urllib2.ProxyHandler({'http': 'http://www.example.com:3128/'})
|
||||||
|
|
|
@ -415,7 +415,7 @@ Paste" library.
|
||||||
from wsgiref.validate import validator
|
from wsgiref.validate import validator
|
||||||
from wsgiref.simple_server import make_server
|
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
|
# standard, so the validator is going to break
|
||||||
def simple_app(environ, start_response):
|
def simple_app(environ, start_response):
|
||||||
status = '200 OK' # HTTP Status
|
status = '200 OK' # HTTP Status
|
||||||
|
|
|
@ -379,7 +379,7 @@ The client code for the preceding server::
|
||||||
try:
|
try:
|
||||||
proxy.add(2, 5)
|
proxy.add(2, 5)
|
||||||
except xmlrpclib.Fault, err:
|
except xmlrpclib.Fault, err:
|
||||||
print "A fault occured"
|
print "A fault occurred"
|
||||||
print "Fault code: %d" % err.faultCode
|
print "Fault code: %d" % err.faultCode
|
||||||
print "Fault string: %s" % err.faultString
|
print "Fault string: %s" % err.faultString
|
||||||
|
|
||||||
|
@ -426,7 +426,7 @@ by providing an invalid URI::
|
||||||
try:
|
try:
|
||||||
proxy.some_method()
|
proxy.some_method()
|
||||||
except xmlrpclib.ProtocolError, err:
|
except xmlrpclib.ProtocolError, err:
|
||||||
print "A protocol error occured"
|
print "A protocol error occurred"
|
||||||
print "URL: %s" % err.url
|
print "URL: %s" % err.url
|
||||||
print "HTTP/HTTPS headers: %s" % err.headers
|
print "HTTP/HTTPS headers: %s" % err.headers
|
||||||
print "Error code: %d" % err.errcode
|
print "Error code: %d" % err.errcode
|
||||||
|
|
|
@ -286,7 +286,7 @@ sometimes there is a need for alternative implementations with different
|
||||||
performance trade-offs.
|
performance trade-offs.
|
||||||
|
|
||||||
The :mod:`array` module provides an :class:`array()` object that is like a list
|
The :mod:`array` module provides an :class:`array()` object that is like a list
|
||||||
that stores only homogenous data and stores it more compactly. The following
|
that stores only homogeneous data and stores it more compactly. The following
|
||||||
example shows an array of numbers stored as two byte unsigned binary numbers
|
example shows an array of numbers stored as two byte unsigned binary numbers
|
||||||
(typecode ``"H"``) rather than the usual 16 bytes per entry for regular lists of
|
(typecode ``"H"``) rather than the usual 16 bytes per entry for regular lists of
|
||||||
python int objects::
|
python int objects::
|
||||||
|
|
|
@ -188,7 +188,7 @@ of your Python installation directory). This suppresses the terminal window on
|
||||||
startup.
|
startup.
|
||||||
|
|
||||||
You can also make all ``.py`` scripts execute with :program:`pythonw.exe`,
|
You can also make all ``.py`` scripts execute with :program:`pythonw.exe`,
|
||||||
setting this through the usual facilites, for example (might require
|
setting this through the usual facilities, for example (might require
|
||||||
administrative rights):
|
administrative rights):
|
||||||
|
|
||||||
#. Launch a command prompt.
|
#. Launch a command prompt.
|
||||||
|
@ -217,7 +217,7 @@ PyWin32
|
||||||
|
|
||||||
The `PyWin32 <http://python.net/crew/mhammond/win32/>`_ module by Mark Hammond
|
The `PyWin32 <http://python.net/crew/mhammond/win32/>`_ module by Mark Hammond
|
||||||
is a collection of modules for advanced Windows-specific support. This includes
|
is a collection of modules for advanced Windows-specific support. This includes
|
||||||
utilites for:
|
utilities for:
|
||||||
|
|
||||||
* `Component Object Model <http://www.microsoft.com/com/>`_ (COM)
|
* `Component Object Model <http://www.microsoft.com/com/>`_ (COM)
|
||||||
* Win32 API calls
|
* Win32 API calls
|
||||||
|
|
|
@ -529,7 +529,7 @@ PEP 371: The ``multiprocessing`` Package
|
||||||
.. XXX I think this still needs help
|
.. XXX I think this still needs help
|
||||||
|
|
||||||
:mod:`multiprocessing` makes it easy to distribute work over multiple processes.
|
:mod:`multiprocessing` makes it easy to distribute work over multiple processes.
|
||||||
Its API is similiar to that of :mod:`threading`. For example::
|
Its API is similar to that of :mod:`threading`. For example::
|
||||||
|
|
||||||
from multiprocessing import Process
|
from multiprocessing import Process
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue