[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #292Merged fixes from 3.5.
vinay.sajip
python-checkins at python.org
Wed Jan 11 12:44:18 EST 2017
https://hg.python.org/cpython/rev/aad038e8dfef
changeset: 106093:aad038e8dfef
branch: 3.6
parent: 106089:114b03fa4c04
parent: 106092:adf8312f377f
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Wed Jan 11 17:41:28 2017 +0000
summary:
Issue #292Merged fixes from 3.5.
files:
Lib/logging/__init__.py | 11 ++++++++---
Lib/test/test_logging.py | 8 ++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -131,9 +131,14 @@
Otherwise, the string "Level %s" % level is returned.
"""
- # See Issues #22386 and #27937 for why it's this way
- return (_levelToName.get(level) or _nameToLevel.get(level) or
- "Level %s" % level)
+ # See Issues #22386, #27937 and #29220 for why it's this way
+ result = _levelToName.get(level)
+ if result is not None:
+ return result
+ result = _nameToLevel.get(level)
+ if result is not None:
+ return result
+ return "Level %s" % level
def addLevelName(level, levelName):
"""
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -313,6 +313,14 @@
fatal = logging.getLevelName('FATAL')
self.assertEqual(fatal, logging.FATAL)
+ def test_regression_29220(self):
+ """See issue #29220 for more information."""
+ logging.addLevelName(logging.INFO, '')
+ self.addCleanup(logging.addLevelName, logging.INFO, 'INFO')
+ self.assertEqual(logging.getLevelName(logging.INFO), '')
+ self.assertEqual(logging.getLevelName(logging.NOTSET), 'NOTSET')
+ self.assertEqual(logging.getLevelName('NOTSET'), logging.NOTSET)
+
class BasicFilterTest(BaseTest):
"""Test the bundled Filter class."""
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list