[Python-checkins] cpython (merge 3.4 -> default): Closes #21245: merged update from 3.4.

[vinay.sajip]

http://hg.python.org/cpython/rev/a0ec713964b1
changeset:   90342:a0ec713964b1
parent:      90339:42d59de284e2
parent:      90341:eee4fd2012ae
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Tue Apr 15 23:13:54 2014 +0100
summary:
  Closes #21245: merged update from 3.4.

files:
  Doc/library/logging.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -250,7 +250,7 @@
    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 @@
    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

-- 
Repository URL: http://hg.python.org/cpython