From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A1C4138334 for ; Thu, 12 Dec 2019 14:47:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8538FE0845; Thu, 12 Dec 2019 14:47:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC334E084A for ; Thu, 12 Dec 2019 14:47:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57D5A34D964 for ; Thu, 12 Dec 2019 14:47:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3C558D8 for ; Thu, 12 Dec 2019 14:47:08 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1576162016.e1b73e0fc9a0dee61f6aaf2574d7edc03fda8a00.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rosbag/, dev-ros/rosbag/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rosbag/files/yaml.patch dev-ros/rosbag/rosbag-1.14.3-r2.ebuild dev-ros/rosbag/rosbag-1.14.3-r3.ebuild X-VCS-Directories: dev-ros/rosbag/files/ dev-ros/rosbag/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: e1b73e0fc9a0dee61f6aaf2574d7edc03fda8a00 X-VCS-Branch: master Date: Thu, 12 Dec 2019 14:47:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f105bab-ec1e-4a41-a9d8-98b4230f38ef X-Archives-Hash: 371093f943189f73274975586d03a423 commit: e1b73e0fc9a0dee61f6aaf2574d7edc03fda8a00 Author: Alexis Ballier gentoo org> AuthorDate: Thu Dec 12 13:29:30 2019 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Dec 12 14:46:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b73e0f dev-ros/rosbag: upstream fix to yaml.load Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier gentoo.org> dev-ros/rosbag/files/yaml.patch | 53 ++++++++++++++++++++++ ...ag-1.14.3-r2.ebuild => rosbag-1.14.3-r3.ebuild} | 1 + 2 files changed, 54 insertions(+) diff --git a/dev-ros/rosbag/files/yaml.patch b/dev-ros/rosbag/files/yaml.patch new file mode 100644 index 00000000000..aea89788c1e --- /dev/null +++ b/dev-ros/rosbag/files/yaml.patch @@ -0,0 +1,53 @@ +From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001 +From: Martijn Buijs +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/rosbag/src/rosbag/bag.py b/tools/rosbag/src/rosbag/bag.py +index 0578aed91..9bdcb693d 100644 +--- a/tools/rosbag/src/rosbag/bag.py ++++ b/tools/rosbag/src/rosbag/bag.py +@@ -1250,7 +1250,7 @@ def __init__(self, d): + else: + setattr(self, a, DictObject(b) if isinstance(b, dict) else b) + +- obj = DictObject(yaml.load(s)) ++ obj = DictObject(yaml.safe_load(s)) + try: + val = eval('obj.' + key) + except Exception as ex: diff --git a/dev-ros/rosbag/rosbag-1.14.3-r2.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild similarity index 95% rename from dev-ros/rosbag/rosbag-1.14.3-r2.ebuild rename to dev-ros/rosbag/rosbag-1.14.3-r3.ebuild index e4ca9d626aa..85bf4e8aee9 100644 --- a/dev-ros/rosbag/rosbag-1.14.3-r2.ebuild +++ b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild @@ -34,3 +34,4 @@ RDEPEND=" DEPEND="${RDEPEND}" RDEPEND="${RDEPEND} lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" )