From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 11 Jan 2017 17:35:36 +0000 (+0000)
Subject: Issue #29220: Improved fix and test.
X-Git-Tag: v3.6.1rc1~182^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=924aaae4c2a99015ca6b448f16eed31bbb598b98;p=thirdparty%2FPython%2Fcpython.git

Issue #29220: Improved fix and test.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 22744e18b073..6455f39ce870 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -129,9 +129,14 @@ def getLevelName(level):
 
     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
index 0e70ccd5f0ee..1c850456b14d 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -308,6 +308,14 @@ class BuiltinLevelsTest(BaseTest):
         self.assertEqual(logging.getLevelName('INFO'), logging.INFO)
         self.assertEqual(logging.getLevelName(logging.INFO), 'INFO')
 
+    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."""