traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX.

This commit is contained in:
Vinay Sajip 2011-03-29 01:21:48 +01:00
parent f851fe9fc5
commit 3c599bdbd1
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Doc/library/logging.rst
View File

@ -2880,13 +2880,10 @@ logging module using these functions or by making calls to the main API (defined
in :mod:`logging` itself) and defining handlers which are declared either in in :mod:`logging` itself) and defining handlers which are declared either in
:mod:`logging` or :mod:`logging.handlers`. :mod:`logging` or :mod:`logging.handlers`.
<<<<<<< local
.. function:: dictConfig(config)
=======
.. currentmodule:: logging.config .. currentmodule:: logging.config
>>>>>>> other
<<<<<<< local .. function:: dictConfig(config)
Takes the logging configuration from a dictionary. The contents of Takes the logging configuration from a dictionary. The contents of
this dictionary are described in :ref:`logging-config-dictschema` this dictionary are described in :ref:`logging-config-dictschema`
below. below.
@ -2928,8 +2925,6 @@ in :mod:`logging` itself) and defining handlers which are declared either in
in the default, uncustomized state. in the default, uncustomized state.
.. versionadded:: 2.7 .. versionadded:: 2.7
=======
>>>>>>> other
.. function:: fileConfig(fname[, defaults]) .. function:: fileConfig(fname[, defaults])
@ -2961,14 +2956,10 @@ in :mod:`logging` itself) and defining handlers which are declared either in
This is typically called before calling :meth:`join` on the return value from This is typically called before calling :meth:`join` on the return value from
:func:`listen`. :func:`listen`.
<<<<<<< local
.. _logging-config-dictschema:
=======
.. currentmodule:: logging .. currentmodule:: logging
>>>>>>> other
<<<<<<< local .. _logging-config-dictschema:
Configuration dictionary schema Configuration dictionary schema
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -3363,8 +3354,6 @@ the system will attempt to retrieve the value from
to ``config_dict['handlers']['myhandler']['mykey']['123']`` if that to ``config_dict['handlers']['myhandler']['mykey']['123']`` if that
fails. fails.
=======
>>>>>>> other
.. _logging-config-fileformat: .. _logging-config-fileformat:
Configuration file format Configuration file format