Fixed test bugs with pyyaml 6

Author: Sylvain MARIE

yamlable/tests/test_yamlable.py

@@ -20,7 +20,7 @@ def __exit__(self, exception_type, exception_value, traceback):
     pass
 
 import pytest
-from yaml import dump, load
+from yaml import dump, safe_load
 
 from yamlable import YamlAble, yaml_info
 
@@ -112,7 +112,7 @@ def close(self):
     assert f == Foo.load_yaml(StringIO(y))
 
     # load pyyaml
-    assert f == load(y)
+    assert f == safe_load(y)
 
     # mapping, sequences and scalar
     y_map = """
@@ -200,7 +200,7 @@ def close(self):
     assert f == FooLegacy.load_yaml(StringIO(y))
 
     # load pyyaml
-    assert f == load(y)
+    assert f == safe_load(y)
 
     assert enc
     assert dec
@@ -262,7 +262,7 @@ def __init__(self, a, b):
 """
     assert dump(f, default_flow_style=False) == s
 
-    assert dump(load(dump(load(s))), default_flow_style=False) == s
+    assert dump(safe_load(dump(safe_load(s))), default_flow_style=False) == s
 
 
 def test_help_yaml_info():
@@ -357,4 +357,4 @@ def close(self):
     assert f == FooValid.load_yaml(StringIO(y))
 
     # load pyyaml
-    assert f == load(y)
+    assert f == safe_load(y)

yamlable/tests/test_yamlcodec.py

@@ -5,7 +5,7 @@
 except ImportError:
     pass
 
-from yaml import dump, load
+from yaml import dump, safe_load
 
 from yamlable import YamlCodec
 
@@ -86,8 +86,8 @@ def to_yaml_dict(cls, obj):
     assert dump(b, default_flow_style=False) == by
 
     # load pyyaml
-    assert f == load(fy)
-    assert b == load(by)
+    assert f == safe_load(fy)
+    assert b == safe_load(by)
 
     # load from sequence / scalar
     by_seq = """!mycodec/yaml.tests.Bar
@@ -96,10 +96,10 @@ def to_yaml_dict(cls, obj):
     by_scalar = "!mycodec/yaml.tests.Bar what?"
 
     with pytest.raises(NotImplementedError):
-        load(by_seq)
+        safe_load(by_seq)
 
     with pytest.raises(NotImplementedError):
-        load(by_scalar)
+        safe_load(by_scalar)
 
     class MyCodec2(MyCodec):
         @classmethod
@@ -123,5 +123,5 @@ def from_yaml_scalar(cls,
     # register the codec
     MyCodec2.register_with_pyyaml()
 
-    assert b == load(by_seq)
-    assert b == load(by_scalar)
+    assert b == safe_load(by_seq)
+    assert b == safe_load(by_scalar)