From 453ecfeb5509a86e500e21d643e265f21d9a0d43 Mon Sep 17 00:00:00 2001 From: Alexis Paques Date: Wed, 10 Jul 2019 15:15:29 +0200 Subject: [PATCH] YAML: use Loaders and safe_load (#11910) --- Tools/validate_yaml.py | 2 +- msg/tools/uorb_rtps_classifier.py | 2 +- msg/tools/uorb_to_ros_rtps_ids.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/validate_yaml.py b/Tools/validate_yaml.py index 3cd9615324..6ece75d989 100755 --- a/Tools/validate_yaml.py +++ b/Tools/validate_yaml.py @@ -40,7 +40,7 @@ verbose = args.verbose def load_yaml_file(file_name): with open(file_name, 'r') as stream: try: - return yaml.load(stream) + return yaml.safe_load(stream) except yaml.YAMLError as exc: print(exc) raise diff --git a/msg/tools/uorb_rtps_classifier.py b/msg/tools/uorb_rtps_classifier.py index 2576474ec1..6480243c88 100644 --- a/msg/tools/uorb_rtps_classifier.py +++ b/msg/tools/uorb_rtps_classifier.py @@ -94,7 +94,7 @@ class Classifier(): """ try: with open(yaml_file, 'r') as f: - return yaml.load(f) + return yaml.load(f, Loader=yaml.FullLoader) except OSError as e: if e.errno == errno.ENOENT: raise IOError(errno.ENOENT, os.strerror( diff --git a/msg/tools/uorb_to_ros_rtps_ids.py b/msg/tools/uorb_to_ros_rtps_ids.py index bdbfca788c..ff5b2a0c64 100644 --- a/msg/tools/uorb_to_ros_rtps_ids.py +++ b/msg/tools/uorb_to_ros_rtps_ids.py @@ -74,7 +74,7 @@ def load_yaml_file(file): with open(file, 'r') as f: if verbose: print("--\t[Step 1] %s yaml file loaded!" % file) - return yaml.load(f) + return yaml.load(f, Loader=yaml.FullLoader) except OSError as e: if e.errno == errno.ENOENT: raise IOError(errno.ENOENT, os.strerror(errno.ENOENT), file)