summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2018-10-18 10:45:58 (GMT)
committerGitHub <noreply@github.com>2018-10-18 10:45:58 (GMT)
commitbbd90e4f6273f1c29c03ab1374fdbd1a862fc14a (patch)
treeae6fc97cf37d098341611c42159a7cce7d14d4a9
parentb7ad31c8926aad2fdd0d4661373c25cc9d753a40 (diff)
downloadcpython-bbd90e4f6273f1c29c03ab1374fdbd1a862fc14a.zip
cpython-bbd90e4f6273f1c29c03ab1374fdbd1a862fc14a.tar.gz
cpython-bbd90e4f6273f1c29c03ab1374fdbd1a862fc14a.tar.bz2
Updated documentation on logging.debug(). (GH-9946)
-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 71a46ac..3a3428a 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -953,8 +953,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