1 files changed, 71 insertions, 0 deletions
diff --git a/dev-ros/rostopic/files/yaml.patch b/dev-ros/rostopic/files/yaml.patch
new file mode 100644
index 000000000000..e96337b50546
--- /dev/null
+++ b/dev-ros/rostopic/files/yaml.patch
@@ -0,0 +1,71 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py             |  2 +-
+ .../test/test_roslib_message.py               |  2 +-
+ .../client_verification/test_slave_api.py     |  2 +-
+ test/test_rosparam/test/check_rosparam.py     |  8 ++---
+ .../check_rosparam_command_line_online.py     |  2 +-
+ .../check_rosservice_command_line_online.py   |  4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py                |  2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
+ tools/roslaunch/src/roslaunch/loader.py       |  4 +--
+ .../test/unit/test_roslaunch_dump_params.py   |  4 +--
+ tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
+ tools/rosservice/src/rosservice/__init__.py   |  4 +--
+ tools/rostopic/src/rostopic/__init__.py       |  6 ++--
+ tools/topic_tools/scripts/relay_field         |  2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py
+index ad244b0f0..41138562e 100644
+--- a/tools/rostopic/src/rostopic/__init__.py
++++ b/tools/rostopic/src/rostopic/__init__.py
+@@ -1779,7 +1779,7 @@ def _rostopic_cmd_pub(argv):
+     try:
+         pub_args = []
+         for arg in args[2:]:
+-            pub_args.append(yaml.load(arg))
++            pub_args.append(yaml.safe_load(arg))
+     except Exception as e:
+         parser.error("Argument error: "+str(e))
+ 
+@@ -1822,7 +1822,7 @@ def bagy_iter():
+         try:
+             with open(filename, 'r') as f:
+                 # load all documents
+-                data = yaml.load_all(f)
++                data = yaml.safe_load_all(f)
+                 for d in data:
+                     yield [d]
+         except yaml.YAMLError as e:
+@@ -2014,7 +2014,7 @@ def stdin_yaml_arg():
+ 
+             if arg.strip() == '---': # End of document
+                 try:
+-                    loaded = yaml.load(buff.rstrip())
++                    loaded = yaml.safe_load(buff.rstrip())
+                 except Exception as e:
+                     sys.stderr.write("Invalid YAML: %s\n"%str(e))
+                 if loaded is not None: