commit:     cf64eac86ab41ef2523defcacd4207c0fccb94e9
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 12:52:35 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 12:58:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf64eac8

dev-ros/tf: stop using yaml.load

Fixes tests

Closes: https://bugs.gentoo.org/623656
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/tf/files/yaml.patch                          | 13 +++++++++++++
 dev-ros/tf/{tf-1.13.2.ebuild => tf-1.13.2-r1.ebuild} |  1 +
 dev-ros/tf/tf-9999.ebuild                            |  1 +
 3 files changed, 15 insertions(+)

diff --git a/dev-ros/tf/files/yaml.patch b/dev-ros/tf/files/yaml.patch
new file mode 100644
index 00000000000..344ef80417a
--- /dev/null
+++ b/dev-ros/tf/files/yaml.patch
@@ -0,0 +1,13 @@
+Index: tf/src/tf/listener.py
+===================================================================
+--- tf.orig/src/tf/listener.py
++++ tf/src/tf/listener.py
+@@ -94,7 +94,7 @@ class Transformer(object):
+ 
+     def getFrameStrings(self):
+         """ Not a recommended API, only here for backwards compatibility """
+-        data = yaml.load(self._buffer.all_frames_as_yaml()) or {}
++        data = yaml.safe_load(self._buffer.all_frames_as_yaml()) or {}
+         return [p for p, _ in data.items()]
+ 
+     def getLatestCommonTime(self, source_frame, dest_frame):

diff --git a/dev-ros/tf/tf-1.13.2.ebuild b/dev-ros/tf/tf-1.13.2-r1.ebuild
similarity index 96%
rename from dev-ros/tf/tf-1.13.2.ebuild
rename to dev-ros/tf/tf-1.13.2-r1.ebuild
index 6f018ff01c1..360303d8a91 100644
--- a/dev-ros/tf/tf-1.13.2.ebuild
+++ b/dev-ros/tf/tf-1.13.2-r1.ebuild
@@ -37,3 +37,4 @@ DEPEND="${RDEPEND}
                dev-cpp/gtest
                $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
        )"
+PATCHES=( "${FILESDIR}/yaml.patch" )

diff --git a/dev-ros/tf/tf-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
index 6f018ff01c1..360303d8a91 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -37,3 +37,4 @@ DEPEND="${RDEPEND}
                dev-cpp/gtest
                $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
        )"
+PATCHES=( "${FILESDIR}/yaml.patch" )

Reply via email to