summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-10-18 10:55:33 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2018-10-18 10:55:33 (GMT)
commitcc279f4b9d0fbab4c8003c97849846bc20259794 (patch)
tree2ff7a6a15bd5dcc3e464516ad4b943493778af5c
parentbcbefe23fe2eb616a03c22764ba4ea79e12e3e28 (diff)
downloadcpython-cc279f4b9d0fbab4c8003c97849846bc20259794.zip
cpython-cc279f4b9d0fbab4c8003c97849846bc20259794.tar.gz
cpython-cc279f4b9d0fbab4c8003c97849846bc20259794.tar.bz2
Updated documentation on logging.debug(). (GH-9946) (GH-9950)
(cherry picked from commit bbd90e4f6273f1c29c03ab1374fdbd1a862fc14a) Co-authored-by: Vinay Sajip <vinay_sajip@yahoo.co.uk>
-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 590d556..60d7758 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -931,8 +931,8 @@ functions.
There are three keyword arguments in *kwargs* which are inspected: *exc_info*
which, if it does not evaluate as false, causes exception information to be
added to the logging message. If an exception tuple (in the format returned by
- :func:`sys.exc_info`) is provided, it is used; otherwise, :func:`sys.exc_info`
- is called to get the exception information.
+ :func:`sys.exc_info`) or an exception instance is provided, it is used;
+ otherwise, :func:`sys.exc_info` is called to get the exception information.
The second optional keyword argument is *stack_info*, which defaults to
``False``. If true, stack information is added to the logging