From: Ben Steffen <bds@mit.edu>
Date: Tue, 26 Nov 2019 21:10:01 +0000 (-0500)
Subject: Don't do anything fancy and just use yaml.CSafeLoader
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/commitdiff_plain/09ff426202d9b8f10d3299a6d6583205f6a37f42

Don't do anything fancy and just use yaml.CSafeLoader
---

diff --git a/python/invirt/config.py b/python/invirt/config.py
index 76c848a..93d61c7 100644
--- a/python/invirt/config.py
+++ b/python/invirt/config.py
@@ -5,8 +5,6 @@ import re
 import yaml
 import invirt.common
 
-try:    loader = yaml.CSafeLoader
-except: loader = yaml.SafeLoader
 
 src_path    = '/etc/invirt/master.yaml'
 src_dirpath = '/etc/invirt/conf.d'
@@ -64,7 +62,7 @@ def load_master():
     config = dict()
     for filename in list_files():
         with open(filename) as f:
-            augment(config, yaml.load(f, loader))
+            augment(config, yaml.load(f, yaml.CSafeLoader))
     return config
 
 def get_src_mtime():