summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2014-04-15 22:13:54 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2014-04-15 22:13:54 (GMT)
commitaef3027aaf0e68a385b549c752a75f7fb54dec57 (patch)
tree641de5af5bb8fdedeb6605bd518f892589d94eb0 /Doc/library
parent15f2d1775e64b3ae0742f0faae108bc3d6e3d5e4 (diff)
parent65425b4bc6499bcbdf99ff1b82a02d8112359542 (diff)
downloadcpython-aef3027aaf0e68a385b549c752a75f7fb54dec57.zip
cpython-aef3027aaf0e68a385b549c752a75f7fb54dec57.tar.gz
cpython-aef3027aaf0e68a385b549c752a75f7fb54dec57.tar.bz2
Closes #21245: merged update from 3.4.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/logging.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 8d093e1..c0a479e 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -250,7 +250,7 @@ is the module's name in the Python package namespace.
interpreted as for :meth:`debug`.
-.. method:: Logger.exception(msg, *args)
+.. method:: Logger.exception(msg, *args, **kwargs)
Logs a message with level :const:`ERROR` on this logger. The arguments are
interpreted as for :meth:`debug`. Exception info is added to the logging
@@ -992,7 +992,7 @@ functions.
are interpreted as for :func:`debug`.
-.. function:: exception(msg, *args)
+.. function:: exception(msg, *args, **kwargs)
Logs a message with level :const:`ERROR` on the root logger. The arguments are
interpreted as for :func:`debug`. Exception info is added to the logging