summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-10-31 01:11:17 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-10-31 01:11:17 (GMT)
commit5605613f9c8743d517a9322d697d3433a6885273 (patch)
tree5a1debb4b92955e00d2b42608597ec68745b32eb
parent0016e1d8baa243a7336340d49cd59908dd3d2494 (diff)
parent9b83d533e2651fa80b81abb114eb6e43c1e383c9 (diff)
downloadcpython-5605613f9c8743d517a9322d697d3433a6885273.zip
cpython-5605613f9c8743d517a9322d697d3433a6885273.tar.gz
cpython-5605613f9c8743d517a9322d697d3433a6885273.tar.bz2
Merged documentation update from 3.3.
-rw-r--r--Doc/library/logging.rst15
1 files changed, 8 insertions, 7 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 4521183..fc5f805 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -794,17 +794,18 @@ information into logging calls. For a usage example , see the section on
(possibly modified) versions of the arguments passed in.
In addition to the above, :class:`LoggerAdapter` supports the following
-methods of :class:`Logger`, i.e. :meth:`debug`, :meth:`info`, :meth:`warning`,
-:meth:`error`, :meth:`exception`, :meth:`critical`, :meth:`log`,
-:meth:`isEnabledFor`, :meth:`getEffectiveLevel`, :meth:`setLevel`,
-:meth:`hasHandlers`. These methods have the same signatures as their
+methods of :class:`Logger`: :meth:`~Logger.debug`, :meth:`~Logger.info`,
+:meth:`~Logger.warning`, :meth:`~Logger.error`, :meth:`~Logger.exception`,
+:meth:`~Logger.critical`, :meth:`~Logger.log`, :meth:`~Logger.isEnabledFor`,
+:meth:`~Logger.getEffectiveLevel`, :meth:`~Logger.setLevel` and
+:meth:`~Logger.hasHandlers`. These methods have the same signatures as their
counterparts in :class:`Logger`, so you can use the two types of instances
interchangeably.
.. versionchanged:: 3.2
- The :meth:`isEnabledFor`, :meth:`getEffectiveLevel`, :meth:`setLevel` and
- :meth:`hasHandlers` methods were added to :class:`LoggerAdapter`. These
- methods delegate to the underlying logger.
+ The :meth:`~Logger.isEnabledFor`, :meth:`~Logger.getEffectiveLevel`,
+ :meth:`~Logger.setLevel` and :meth:`~Logger.hasHandlers` methods were added
+ to :class:`LoggerAdapter`. These methods delegate to the underlying logger.
Thread Safety