Merging upstream version 0.18.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 129 insertions, 0 deletions

diff --git a/_test/test_deprecation.py b/_test/test_deprecation.py
new file mode 100644
index 0000000..ea86f5f
--- /dev/null
+++ b/_test/test_deprecation.py
@@ -0,0 +1,129 @@
+# coding: utf-8
+
+import sys
+import pytest  # type:ignore  # NOQA
+
+last_to_warn = (0, 17, 40)
+
+
+@pytest.mark.skipif(sys.version_info < (3, 7) or sys.version_info >= (3, 9),  # type: ignore
+                    reason='collections not available?')
+def test_collections_deprecation() -> None:
+    with pytest.warns(DeprecationWarning):
+        from collections import Hashable  # type: ignore  # NOQA
+
+
+class TestFunctionDeprecation:
+    def test_deprecation_scan(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            with pytest.warns(PendingDeprecationWarning):
+                data = ruamel.yaml.load('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.load('a: 42')  # NOQA
+
+    def test_deprecation_parse(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            data = ruamel.yaml.parse('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+    def test_deprecation_compose(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            with pytest.warns(PendingDeprecationWarning):
+                data = ruamel.yaml.compose('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+    def test_deprecation_compose_all(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            data = ruamel.yaml.compose_all('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+    def test_deprecation_load(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            with pytest.warns(PendingDeprecationWarning):
+                data = ruamel.yaml.load('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+    def test_deprecation_load_all(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            data = ruamel.yaml.load_all('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+    def test_deprecation_safe_load(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            with pytest.warns(PendingDeprecationWarning):
+                data = ruamel.yaml.safe_load('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+    def test_deprecation_round_trip_load(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info <= last_to_warn:
+            with pytest.warns(PendingDeprecationWarning):
+                data = ruamel.yaml.round_trip_load('a: 42')  # NOQA
+        else:
+            with pytest.raises(AttributeError):
+                data = ruamel.yaml.parse('a: 42')  # NOQA
+
+
+class TestYamlTyp:
+    def test_unsafe_deprecation(self) -> None:
+        import ruamel.yaml
+
+        if ruamel.yaml.version_info < (0, 18, 0):
+            yaml = ruamel.yaml.YAML(typ='unsafe')
+        else:
+            with pytest.warns(PendingDeprecationWarning):
+                #   with pytest.raises(SystemExit):
+                yaml = ruamel.yaml.YAML(typ='unsafe')  # NOQA
+
+    def test_full_load_error(self) -> None:
+        import ruamel.yaml
+
+        yaml = ruamel.yaml.YAML(typ='full', pure=True)
+        with pytest.raises(ruamel.yaml.error.YAMLError):
+            yaml.load('a: b')
+        yaml = ruamel.yaml.YAML(typ='full')  # C scanner/loader
+        with pytest.raises(ruamel.yaml.error.YAMLError):
+            yaml.load('a: b')
+
+    def test_full_rt(self) -> None:
+        import os
+        import io
+        import ruamel.yaml
+
+        yaml = ruamel.yaml.YAML(typ='full', pure=True)
+        buf = io.BytesIO()
+        yaml.dump([{'fun': os.system}], buf)
+        print(buf.getvalue())
+        yaml = ruamel.yaml.YAML()
+        data = yaml.load(buf.getvalue())
+        print(data)
+        ts = data[0]['fun']
+        assert 'posix.system' in str(ts.tag)