Changeset 14383 in genesis for tools/gformat.py

Timestamp:

Jul 2, 2019, 9:18:41 AM (5 years ago)

Author:

rick

Message:

Fix YAMLLoadWarning deprecation

​https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

File:

• tools/gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -1055 +1055 @@
   elems = sorted([elem for elem in config.keys() if (elem.startswith('iface_') and not "lo0" in elem)])
   if extra == False:
-    return filter(lambda x: not "extra" in x, elems)
+    return list(filter(lambda x: not "extra" in x, elems))
   else:
     return elems
@@ -1665 +1665 @@
   ## roomburgh=Roomburgh1
   ## apkerk1.Vosko=172.17.176.8 ;this as well
-  dns_list = yaml.load(open(os.path.join(NODE_DIR,'../dns/staticDNS.yaml'),'r'))
+  dns_list = yaml.load(open(os.path.join(NODE_DIR,'../dns/staticDNS.yaml'),'r'), Loader=Loader)
 
   # Hack to allow special entries, for development