[gentoo-commits] repo/gentoo:master commit in: dev-ros/test_rosservice/files/, dev-ros/test_rosservice/

[gentoo-commits] repo/gentoo:master commit in: dev-ros/test_rosservice/files/, dev-ros/test_rosservice/

[Alexis Ballier]

commit:     fd80ab6610b491ad4d6d9cb16d14e0e580522681
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 12:51:53 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 14:46:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd80ab66

dev-ros/test_rosservice: upstream fix to yaml.load

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/test_rosservice/files/yaml.patch           | 62 ++++++++++++++++++++++
 ...4.3.ebuild => test_rosservice-1.14.3-r1.ebuild} |  3 +-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/dev-ros/test_rosservice/files/yaml.patch b/dev-ros/test_rosservice/files/yaml.patch
new file mode 100644
index 00000000000..e8d089cbfd0
--- /dev/null
+++ b/dev-ros/test_rosservice/files/yaml.patch
@@ -0,0 +1,62 @@
+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/test/test_rosservice/test/check_rosservice_command_line_online.py b/test/test_rosservice/test/check_rosservice_command_line_online.py
+index dc696adba..c75a52c15 100755
+--- a/test/test_rosservice/test/check_rosservice_command_line_online.py
++++ b/test/test_rosservice/test/check_rosservice_command_line_online.py
+@@ -122,7 +122,7 @@ def test_rosservice(self):
+             output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
+             output = output.strip()
+             self.assert_(output, output)
+-            val = yaml.load(output)['header']
++            val = yaml.safe_load(output)['header']
+             self.assertEquals('', val['frame_id'])
+             self.assert_(val['seq'] >= 0)
+             self.assertEquals(0, val['stamp']['secs'])
+@@ -131,7 +131,7 @@ def test_rosservice(self):
+         # test with auto headers
+         for v in ['{header: auto}', '{header: {stamp: now}}']:
+             output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
+-            val = yaml.load(output.strip())['header']
++            val = yaml.safe_load(output.strip())['header']
+             self.assertEquals('', val['frame_id'])
+             self.assert_(val['seq'] >= 0)
+             self.assert_(val['stamp']['secs'] >= int(t))

diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
similarity index 89%
rename from dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild
rename to dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
index e129fbdc99e..eb480554239 100644
--- a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild
+++ b/dev-ros/test_rosservice/test_rosservice-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
@@ -28,3 +28,4 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/yaml.patch" )