diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2019-12-12 14:53:54 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2019-12-12 15:46:58 +0100 |
| commit | 7800bccd94dd6767008faabec3cf6b818ed0f085 (patch) | |
| tree | 1777becdb408aa7ed09ada6c4ffd726f057a765f /dev-ros | |
| parent | dev-ros/topic_tools: Remove old (diff) | |
| download | gentoo-7800bccd94dd6767008faabec3cf6b818ed0f085.tar.gz gentoo-7800bccd94dd6767008faabec3cf6b818ed0f085.tar.bz2 gentoo-7800bccd94dd6767008faabec3cf6b818ed0f085.zip | |
dev-ros/topic_tools: upstream yaml fixes
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/topic_tools/files/yaml.patch | 53 | ||||
| -rw-r--r-- | dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild (renamed from dev-ros/topic_tools/topic_tools-1.14.3.ebuild) | 3 |
2 files changed, 55 insertions, 1 deletions
diff --git a/dev-ros/topic_tools/files/yaml.patch b/dev-ros/topic_tools/files/yaml.patch new file mode 100644 index 000000000000..e783e321b7fb --- /dev/null +++ b/dev-ros/topic_tools/files/yaml.patch @@ -0,0 +1,53 @@ +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/topic_tools/scripts/relay_field b/tools/topic_tools/scripts/relay_field +index 6630b685d..cc73ac443 100755 +--- a/tools/topic_tools/scripts/relay_field ++++ b/tools/topic_tools/scripts/relay_field +@@ -98,7 +98,7 @@ class RelayField(object): + if self.input_fn is not None: + m = self.input_fn(m) + +- msg_generation = yaml.load(self.expression) ++ msg_generation = yaml.safe_load(self.expression) + pub_args = _eval_in_dict_impl(msg_generation, None, {'m': m}) + + now = rospy.get_rostime() diff --git a/dev-ros/topic_tools/topic_tools-1.14.3.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild index 227b9521dac4..ecddea9d6441 100644 --- a/dev-ros/topic_tools/topic_tools-1.14.3.ebuild +++ b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -31,3 +31,4 @@ DEPEND="${RDEPEND} dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) |