commit 44ac3c5fe9b454b7316465162df8b651f23b9f75
author Vinay Sajip <vinay_sajip@yahoo.co.uk> Sat Sep 03 16:55:35 2016 +0100
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> Sat Sep 03 16:55:35 2016 +0100
tree 93d4a35adee16d021bc94dedfa7b555d23c1c24e
parent d635f2f54feef456bb127f3e72e69e9d0ea59b22
parent 1b8f7b818fdb851b428f5032963ecba310f071e3

Merge upstream change.

Lib/logging/__init__.py

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 4d872bd..0c5c2ec 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -130,8 +130,9 @@
 
     Otherwise, the string "Level %s" % level is returned.
     """
-    # See Issue #22386 for the reason for this convoluted expression
-    return _levelToName.get(level, _nameToLevel.get(level, ("Level %s" % level)))
+    # See Issues #22386 and #27937 for why it's this way
+    return (_levelToName.get(level) or _nameToLevel.get(level) or
+            "Level %s" % level)
 
 def addLevelName(level, levelName):
     """