Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged doc fix in 3.2.

This commit is contained in:
Vinay Sajip 2011-04-08 01:32:27 +01:00
parent d08b330a15 c46102c98a
commit bfd463c57d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Doc/library/logging.rst
View File

@ -405,7 +405,7 @@ The useful mapping keys in a :class:`LogRecord` are given in the section on
:ref:`logrecord-attributes`. :ref:`logrecord-attributes`.
.. class:: Formatter(fmt=None, datefmt=None) .. class:: Formatter(fmt=None, datefmt=None, style='%')
Returns a new instance of the :class:`Formatter` class. The instance is Returns a new instance of the :class:`Formatter` class. The instance is
initialized with a format string for the message as a whole, as well as a initialized with a format string for the message as a whole, as well as a
@ -413,6 +413,14 @@ The useful mapping keys in a :class:`LogRecord` are given in the section on
specified, ``'%(message)s'`` is used. If no *datefmt* is specified, the specified, ``'%(message)s'`` is used. If no *datefmt* is specified, the
ISO8601 date format is used. ISO8601 date format is used.
The *style* parameter can be one of '%', '{' or '$' and determines how
the format string will be merged with its data: using one of %-formatting,
:meth:`str.format` or :class:`string.Template`.
.. versionchanged:: 3.2
The *style* parameter was added.
.. method:: format(record) .. method:: format(record)
The record's attribute dictionary is used as the operand to a string The record's attribute dictionary is used as the operand to a string
@ -691,7 +699,6 @@ LoggerAdapter Objects
information into logging calls. For a usage example , see the section on information into logging calls. For a usage example , see the section on
:ref:`adding contextual information to your logging output <context-info>`. :ref:`adding contextual information to your logging output <context-info>`.
.. class:: LoggerAdapter(logger, extra) .. class:: LoggerAdapter(logger, extra)
Returns an instance of :class:`LoggerAdapter` initialized with an Returns an instance of :class:`LoggerAdapter` initialized with an