Replace pyyaml library with ruamel.yaml

This was done to address the concern raised in the PR - usnistgov#1091 (comment)
guyzyl · Jan 19, 2022 · cda97d0 · cda97d0
1 parent 178b5f9
commit cda97d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/utils/util/oscal-content-validator.py b/src/utils/util/oscal-content-validator.py
@@ -6,7 +6,7 @@
 import argparse
 from jsonschema import validate
 import xmlschema
-import yaml
+from ruamel.yaml import YAML
 
 
 def _get_oscal_file_type(filename):
@@ -25,6 +25,7 @@ def read_file(filename, ftype):
         if ftype == "json":
             filedata = json.load(f)
         if ftype == "yaml":
+            yaml = YAML()
             filedata = yaml.load(f)
         else:
             filedata = f.read()

diff --git a/src/utils/util/requirements.txt b/src/utils/util/requirements.txt
@@ -1,3 +1,3 @@
 jsonschema
 xmlschema
-pyyaml
+ruamel.yaml