mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge heads.

Browse source
This commit is contained in:
Ezio Melotti 2012-09-08 20:52:19 +03:00
commit 8bdcdc235e
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Doc/library/configparser.rst
View file

@ -1007,7 +1007,7 @@ ConfigParser Objects
.. versionadded:: 3.2 .. versionadded:: 3.2
.. method:: get(section, option, raw=False, [vars, fallback]) .. method:: get(section, option, *, raw=False, vars=None[, fallback])
Get an *option* value for the named *section*. If *vars* is provided, it Get an *option* value for the named *section*. If *vars* is provided, it
must be a dictionary. The *option* is looked up in *vars* (if provided), must be a dictionary. The *option* is looked up in *vars* (if provided),
@ -1025,21 +1025,21 @@ ConfigParser Objects
(especially when using the mapping protocol). (especially when using the mapping protocol).
.. method:: getint(section, option, raw=False, [vars, fallback]) .. method:: getint(section, option, *, raw=False, vars=None[, fallback])
A convenience method which coerces the *option* in the specified *section* A convenience method which coerces the *option* in the specified *section*
to an integer. See :meth:`get` for explanation of *raw*, *vars* and to an integer. See :meth:`get` for explanation of *raw*, *vars* and
*fallback*. *fallback*.
.. method:: getfloat(section, option, raw=False, [vars, fallback]) .. method:: getfloat(section, option, *, raw=False, vars=None[, fallback])
A convenience method which coerces the *option* in the specified *section* A convenience method which coerces the *option* in the specified *section*
to a floating point number. See :meth:`get` for explanation of *raw*, to a floating point number. See :meth:`get` for explanation of *raw*,
*vars* and *fallback*. *vars* and *fallback*.
.. method:: getboolean(section, option, raw=False, [vars, fallback]) .. method:: getboolean(section, option, *, raw=False, vars=None[, fallback])
A convenience method which coerces the *option* in the specified *section* A convenience method which coerces the *option* in the specified *section*
to a Boolean value. Note that the accepted values for the option are to a Boolean value. Note that the accepted values for the option are
@ -1149,7 +1149,13 @@ ConfigParser Objects
RawConfigParser Objects RawConfigParser Objects
----------------------- -----------------------
.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configaparser.DEFAULTSECT, interpolation=None) .. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \
allow_no_value=False, *, delimiters=('=', ':'), \
comment_prefixes=('#', ';'), \
inline_comment_prefixes=None, strict=True, \
empty_lines_in_values=True, \
default_section=configparser.DEFAULTSECT[, \
interpolation])
Legacy variant of the :class:`ConfigParser` with interpolation disabled Legacy variant of the :class:`ConfigParser` with interpolation disabled
by default and unsafe ``add_section`` and ``set`` methods. by default and unsafe ``add_section`` and ``set`` methods.

6
Doc/library/nntplib.rst
View file

@ -474,10 +474,10 @@ The following are optional NNTP extensions defined in :rfc:`2980`. Some of
them have been superseded by newer commands in :rfc:`3977`. them have been superseded by newer commands in :rfc:`3977`.
.. method:: NNTP.xhdr(header, string, *, file=None) .. method:: NNTP.xhdr(hdr, str, *, file=None)
Send an ``XHDR`` command. The *header* argument is a header keyword, e.g. Send an ``XHDR`` command. The *hdr* argument is a header keyword, e.g.
``'subject'``. The *string* argument should have the form ``'first-last'`` ``'subject'``. The *str* argument should have the form ``'first-last'``
where *first* and *last* are the first and last article numbers to search. where *first* and *last* are the first and last article numbers to search.
Return a pair ``(response, list)``, where *list* is a list of pairs ``(id, Return a pair ``(response, list)``, where *list* is a list of pairs ``(id,
text)``, where *id* is an article number (as a string) and *text* is the text of text)``, where *id* is an article number (as a string) and *text* is the text of