From bbad41baf8ebcfd5c8d700c5188c5a3bbb213730 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Tue, 2 Apr 2019 10:07:43 +0100 Subject: [PATCH] Use yaml loader in vagrant CLI to avoid warning [skip ci] --- admin/custom_linters.py | 2 +- src/dcos_e2e_cli/common/options.py | 2 +- tests/test_dcos_e2e/backends/vagrant/test_vagrant.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/custom_linters.py b/admin/custom_linters.py index f089f1903..3544977ba 100644 --- a/admin/custom_linters.py +++ b/admin/custom_linters.py @@ -22,7 +22,7 @@ def _travis_ci_patterns() -> Set[str]: """ travis_file = Path(__file__).parent.parent / '.travis.yml' travis_contents = travis_file.read_text() - travis_dict = yaml.load(travis_contents) + travis_dict = yaml.load(travis_contents. Loader=yaml.FullLoader) travis_matrix = travis_dict['env']['matrix'] ci_patterns = set() # type: Set[str] diff --git a/src/dcos_e2e_cli/common/options.py b/src/dcos_e2e_cli/common/options.py index a2eb33b04..30e3f3606 100644 --- a/src/dcos_e2e_cli/common/options.py +++ b/src/dcos_e2e_cli/common/options.py @@ -85,7 +85,7 @@ def _validate_dcos_configuration( content = Path(str(value)).read_text() try: - return dict(yaml.load(content) or {}) + return dict(yaml.load(content, Loader=yaml.FullLoader) or {}) except ValueError: message = '"{content}" is not a valid DC/OS configuration'.format( content=content, diff --git a/tests/test_dcos_e2e/backends/vagrant/test_vagrant.py b/tests/test_dcos_e2e/backends/vagrant/test_vagrant.py index 542592aaa..1d729e1df 100644 --- a/tests/test_dcos_e2e/backends/vagrant/test_vagrant.py +++ b/tests/test_dcos_e2e/backends/vagrant/test_vagrant.py @@ -71,7 +71,7 @@ def _ip_from_vm_name(vm_name: str, property_name, ] property_result = vertigo_py.execute(args=args) # type: ignore - results = yaml.load(property_result) + results = yaml.load(property_result, Loader=yaml.FullLoader) if results == 'No value set!': return None return IPv4Address(results['Value'])