Merge pull request #1632 from dcos/yaml-loader

Use explicit yaml loader to avoid warnings
dcos · Apr 2, 2019 · d54e3f8 · d54e3f8
2 parents acad61b + bbad41b
commit d54e3f8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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/src/dcos_e2e_cli/dcos_vagrant/commands/_common.py b/src/dcos_e2e_cli/dcos_vagrant/commands/_common.py
@@ -48,7 +48,7 @@ def _ip_from_vm_name(vm_name: str) -> Optional[IPv4Address]:
         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'])

diff --git 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'])