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

[vinay.sajip]

http://hg.python.org/cpython/rev/174c30103b57
changeset:   91171:174c30103b57
parent:      91169:439ae988be8d
parent:      91170:277d099a134b
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sat Jun 14 09:27:10 2014 +0100
summary:
  Closes #21752: Merged update from 3.4.

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


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

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