From 03f31c6caffd569fdcc4c691dab048da4c3ced85 Mon Sep 17 00:00:00 2001 From: Sandon Van Ness Date: Fri, 8 Nov 2013 11:02:48 -0800 Subject: [PATCH] Consolidate two excepts into one. Signed-off-by: Sandon Van Ness --- teuthology/misc.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 199ee15fdc35d..02de9dfd9ea2c 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -941,8 +941,5 @@ def get_distro_version(ctx): os_version = default_os_version[distro] try: return ctx.config['downburst'].get('distroversion', os_version) - except KeyError: - return os_version - except AttributeError: + except (KeyError, AttributeError): return os_version - -- 2.39.5