diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-01-11 17:44:07 +0000 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-01-11 17:44:07 +0000 |
| commit | d4f5001bac6a5d5fafb723a17cf792758fca6ea2 (patch) | |
| tree | cebf267f45c23c3bf159c9623adb09688ecf737f /Lib/logging | |
| parent | 23e5b82cf74e225c57e8049907d04f6af6f8bfae (diff) | |
| parent | a861d48817e2477cd0b5189787d071ff01dbe4f7 (diff) | |
| download | cpython-git-d4f5001bac6a5d5fafb723a17cf792758fca6ea2.tar.gz | |
Issue #29220: Merged fixes from 3.6.
Diffstat (limited to 'Lib/logging')
| -rw-r--r-- | Lib/logging/__init__.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index fb866f39d9..49a069255f 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -133,11 +133,12 @@ def getLevelName(level): """ # See Issues #22386, #27937 and #29220 for why it's this way result = _levelToName.get(level) - if result is None: - result = _nameToLevel.get(level) - if result is None: - result = "Level %s" % level - return result + 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): """ |