bob: add pyyaml 6.0 compatibility

Somehow we missed the long pending deprecation of yaml.load without the
'Loader' parameter.

Author: jkloetzke

pym/bob/input.py

@@ -28,7 +28,10 @@
 import sqlite3
 import struct
 import sys
-import yaml
+try:
+    from yaml import load as yamlLoad, CSafeLoader as YamlSafeLoader
+except ImportError:
+    from yaml import load as yamlLoad, SafeLoader as YamlSafeLoader
 
 warnFilter = WarnOnce("The filter keyword is experimental and might change or vanish in the future.")
 warnDepends = WarnOnce("The same package is named multiple times as dependency!",
@@ -3887,7 +3890,7 @@ def __if_expression_constructor(loader, node):
         expr = loader.construct_scalar(node)
         return IfExpression(expr)
 
-    yaml.SafeLoader.add_constructor(u'!expr', __if_expression_constructor)
+    YamlSafeLoader.add_constructor(u'!expr', __if_expression_constructor)
 
     def open(self):
         try:
@@ -3945,7 +3948,7 @@ def loadYaml(self, name, yamlSchema, default, preValidate):
             with open(name, "r", encoding='utf8') as f:
                 try:
                     rawData = f.read()
-                    data = yaml.safe_load(rawData)
+                    data = yamlLoad(rawData, Loader=YamlSafeLoader)
                     digest = hashlib.sha1(rawData.encode('utf8')).digest()
                 except Exception as e:
                     raise ParseError("Error while parsing {}: {}".format(name, str(e)))

test/show/run.sh

@@ -20,20 +20,20 @@ run_bob show --format diff --show-common root/dep/ root/sandbox/ | grep -q scrip
 # Verify that empty properties are hidden by default but can be activated
 run_bob show root --no-indent | python3 -c '
 import sys, yaml
-d = yaml.load(sys.stdin.read())
+d = yaml.load(sys.stdin.read(), Loader=yaml.Loader)
 assert "checkoutTools" not in d
 '
 
 run_bob show root --show-empty | python3 -c '
 import sys, yaml
-d = yaml.load(sys.stdin.read())
+d = yaml.load(sys.stdin.read(), Loader=yaml.Loader)
 assert d["checkoutTools"] == {}
 '
 
 # Verify that filtering works as expected
 run_bob show root -f buildVars -f packageVars | python3 -c '
 import sys, yaml
-d = yaml.load(sys.stdin.read())
+d = yaml.load(sys.stdin.read(), Loader=yaml.Loader)
 assert set(d.keys()) == {"buildVars", "packageVars"}
 assert set(d["buildVars"].keys()) == {"FOO", "BAR"}
 assert set(d["packageVars"].keys()) == {"FOO", "BAR", "META"}

test/test_input_scmoverride.py

@@ -206,4 +206,4 @@ def testDump(self):
         }
 
         o = ScmOverride(spec)
-        self.assertEqual(spec, yaml.load(str(o)))
+        self.assertEqual(spec, yaml.load(str(o), Loader=yaml.Loader))