From 9e72266705f643bed4a53ec94cf1e4ae53f66b22 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 5 Jun 2020 08:43:17 +1000
Subject: [PATCH] Improve the behaviour of yamlget.py when run with python2

---
 bin/tests/system/digdelv/yamlget.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/tests/system/digdelv/yamlget.py b/bin/tests/system/digdelv/yamlget.py
index 5e35c5658a..77ac0f04a3 100644
--- a/bin/tests/system/digdelv/yamlget.py
+++ b/bin/tests/system/digdelv/yamlget.py
@@ -13,7 +13,9 @@ import sys
 
 try:
     import yaml
-except (ModuleNotFoundError, ImportError):
+# flake8: noqa: E722
+# pylint: disable=bare-except
+except:
     print("No python yaml module, skipping")
     sys.exit(1)
 
@@ -25,6 +27,10 @@ with open(sys.argv[1], "r") as f:
             except ValueError:
                 pass
 
-            item = item[key]
+            try:
+                item = item[key]
+            except KeyError:
+                print('Key "' + key + '" not found.')
+                sys.exit(1)
 
         print(item)