diff options
| -rw-r--r-- | Doc/glossary.rst | 2 | ||||
| -rw-r--r-- | Doc/library/builtins.rst | 2 | ||||
| -rw-r--r-- | Doc/library/imaplib.rst | 2 | ||||
| -rw-r--r-- | Doc/library/packaging.pypi.simple.rst | 2 | ||||
| -rw-r--r-- | Doc/library/packaging.pypi.xmlrpc.rst | 2 | ||||
| -rw-r--r-- | Doc/library/socketserver.rst | 29 |
6 files changed, 20 insertions, 19 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 4f1795d..04b3fbb 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -587,7 +587,7 @@ Glossary as :keyword:`if`, :keyword:`while` or :keyword:`for`. struct sequence - A tuple with named elements. Struct sequences expose an interface similiar + A tuple with named elements. Struct sequences expose an interface similar to :term:`named tuple` in that elements can either be accessed either by index or as an attribute. However, they do not have any of the named tuple methods like :meth:`~collections.somenamedtuple._make` or diff --git a/Doc/library/builtins.rst b/Doc/library/builtins.rst index d4199d2..2cca1d0 100644 --- a/Doc/library/builtins.rst +++ b/Doc/library/builtins.rst @@ -36,6 +36,6 @@ that wants to implement an :func:`open` function that wraps the built-in As an implementation detail, most modules have the name ``__builtins__`` made available as part of their globals. The value of ``__builtins__`` is normally -either this module or the value of this modules's :attr:`__dict__` attribute. +either this module or the value of this module's :attr:`__dict__` attribute. Since this is an implementation detail, it may not be used by alternate implementations of Python. diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst index 592e4b0..038355c 100644 --- a/Doc/library/imaplib.rst +++ b/Doc/library/imaplib.rst @@ -116,7 +116,7 @@ The following utility functions are defined: Convert *date_time* to an IMAP4 ``INTERNALDATE`` representation. The return value is a string in the form: ``"DD-Mmm-YYYY HH:MM:SS +HHMM"`` (including double-quotes). The *date_time* argument can be a - number (int or float) represening seconds since epoch (as returned + number (int or float) representing seconds since epoch (as returned by :func:`time.time`), a 9-tuple representing local time (as returned by :func:`time.localtime`), or a double-quoted string. In the last case, it is assumed to already be in the correct format. diff --git a/Doc/library/packaging.pypi.simple.rst b/Doc/library/packaging.pypi.simple.rst index 9153738..126c224 100644 --- a/Doc/library/packaging.pypi.simple.rst +++ b/Doc/library/packaging.pypi.simple.rst @@ -30,7 +30,7 @@ API The first two parameters control the query results. *prefer_final* indicates whether a final version (not alpha, beta or candidate) is to be - prefered over a newer but non-final version (for example, whether to pick + preferred over a newer but non-final version (for example, whether to pick up 1.0 over 2.0a3). It is used only for queries that don't give a version argument. Likewise, *prefer_source* tells whether to prefer a source distribution over a binary one, if no distribution argument was prodived. diff --git a/Doc/library/packaging.pypi.xmlrpc.rst b/Doc/library/packaging.pypi.xmlrpc.rst index 0253d68..5242e4c 100644 --- a/Doc/library/packaging.pypi.xmlrpc.rst +++ b/Doc/library/packaging.pypi.xmlrpc.rst @@ -94,7 +94,7 @@ The specific fields you can search are: Getting metadata information ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -XML-RPC is a prefered way to retrieve metadata information from indexes. +XML-RPC is a preferred way to retrieve metadata information from indexes. It's really simple to do so:: >>> client = xmlrpc.Client() diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 8623380..497e3ee 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -39,11 +39,12 @@ process one or many requests. When inheriting from :class:`ThreadingMixIn` for threaded connection behavior, you should explicitly declare how you want your threads to behave on an abrupt -shutdown. The :class:`ThreadingMixIn` class defines an attribute +shutdown. The :class:`ThreadingMixIn` class defines an attribute *daemon_threads*, which indicates whether or not the server should wait for -thread termination. You should set the flag explicitly if you would like threads -to behave autonomously; the default is :const:`False`, meaning that Python will -not exit until all threads created by :class:`ThreadingMixIn` have exited. +thread termination. You should set the flag explicitly if you would like +threads to behave autonomously; the default is :const:`False`, meaning that +Python will not exit until all threads created by :class:`ThreadingMixIn` have +exited. Server classes have the same external methods and attributes, no matter what network protocol they use. @@ -115,8 +116,8 @@ or inappropriate for the service) is to maintain an explicit table of partially finished requests and to use :func:`select` to decide which request to work on next (or whether to handle a new incoming request). This is particularly important for stream services where each client can potentially be connected for -a long time (if threads or subprocesses cannot be used). See :mod:`asyncore` for -another way to manage this. +a long time (if threads or subprocesses cannot be used). See :mod:`asyncore` +for another way to manage this. .. XXX should data and methods be intermingled, or separate? how should the distinction between class and instance variables be drawn? @@ -153,9 +154,9 @@ Server Objects .. method:: BaseServer.serve_forever(poll_interval=0.5) Handle requests until an explicit :meth:`shutdown` request. Polls for - shutdown every *poll_interval* seconds. It also calls + shutdown every *poll_interval* seconds. It also calls :meth:`service_actions` which may be used by a subclass or Mixin to provide - various cleanup actions. For e.g. ForkingMixin class uses + various cleanup actions. For e.g. ForkingMixin class uses :meth:`service_actions` to cleanup the zombie child processes. .. versionchanged:: 3.3 @@ -205,7 +206,7 @@ The server classes support the following class variables: .. attribute:: BaseServer.allow_reuse_address - Whether the server will allow the reuse of an address. This defaults to + Whether the server will allow the reuse of an address. This defaults to :const:`False`, and can be set in subclasses to change the policy. @@ -282,7 +283,7 @@ users of the server object. .. method:: BaseServer.server_activate() Called by the server's constructor to activate the server. The default behavior - just :meth:`listen`\ s to the server's socket. May be overridden. + just :meth:`listen`\ s to the server's socket. May be overridden. .. method:: BaseServer.server_bind() @@ -293,10 +294,10 @@ users of the server object. .. method:: BaseServer.verify_request(request, client_address) - Must return a Boolean value; if the value is :const:`True`, the request will be - processed, and if it's :const:`False`, the request will be denied. This function - can be overridden to implement access controls for a server. The default - implementation always returns :const:`True`. + Must return a Boolean value; if the value is :const:`True`, the request will + be processed, and if it's :const:`False`, the request will be denied. This + function can be overridden to implement access controls for a server. The + default implementation always returns :const:`True`. RequestHandler Objects |