summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2014-06-14 08:27:10 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2014-06-14 08:27:10 (GMT)
commit21ceada492c27832cc262c6f3ac6fd9959bc14e2 (patch)
tree9951b3e341e0e8b957cb5389237af6986bd502b8
parentb321e79123595cb24ac9b0b48d36b19f7051d076 (diff)
parente0d324d02b5a9a5c22d79d0443ca68bf33398978 (diff)
downloadcpython-21ceada492c27832cc262c6f3ac6fd9959bc14e2.zip
cpython-21ceada492c27832cc262c6f3ac6fd9959bc14e2.tar.gz
cpython-21ceada492c27832cc262c6f3ac6fd9959bc14e2.tar.bz2
Closes #21752: Merged update from 3.4.
-rw-r--r--Doc/library/logging.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index c0a479e..a3e2770 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -1049,6 +1049,11 @@ functions.
of the defined levels is passed in, the corresponding string representation is
returned. Otherwise, the string 'Level %s' % lvl is returned.
+ .. versionchanged:: 3.4
+ In Python versions earlier than 3.4, this function could also be passed a
+ text level, and would return the corresponding numeric value of the level.
+ This undocumented behaviour was a mistake, and has been removed in Python
+ 3.4.
.. function:: makeLogRecord(attrdict)