gentoo resync : 29.12.2022

1 files changed, 0 insertions, 52 deletions

diff --git a/dev-python/rospkg/files/yaml_load.patch b/dev-python/rospkg/files/yaml_load.patch
deleted file mode 100644
index f56b6db59ad8..000000000000
--- a/dev-python/rospkg/files/yaml_load.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: rospkg-1.2.0/src/rospkg/distro.py
-===================================================================
---- rospkg-1.2.0.orig/src/rospkg/distro.py
-+++ rospkg-1.2.0/src/rospkg/distro.py
-@@ -192,14 +192,14 @@ def load_distro(source_uri):
-         if os.path.isfile(source_uri):
-             # load rosdistro file
-             with open(source_uri) as f:
--                raw_data = yaml.load(f.read())
-+                raw_data = yaml.safe_load(f.read())
-         else:
-             try:
-                 request = urlopen(source_uri)
-             except Exception as e:
-                 raise ResourceNotFound('%s (%s)' % (str(e), source_uri))
-             try:
--                raw_data = yaml.load(request)
-+                raw_data = yaml.safe_load(request)
-             except ValueError:
-                 raise ResourceNotFound(source_uri)
-         if not type(raw_data) == dict:
-Index: rospkg-1.2.0/test/test_rospkg_distro.py
-===================================================================
---- rospkg-1.2.0.orig/test/test_rospkg_distro.py
-+++ rospkg-1.2.0/test/test_rospkg_distro.py
-@@ -315,7 +315,7 @@ def test_load_distro_simple():
- 
-     assert distro.release_name == 'simple', distro.release_name
-     assert distro.version == '1', distro.version
--    assert yaml.load(open(p)) == distro.raw_data, distro.raw_data
-+    assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data
-     assert set(distro.variants.keys()) == set(['base'])
-     assert set(distro.stacks.keys()) == set(['stack1'])
- 
-@@ -334,7 +334,7 @@ def test_load_distro_diamondback():
- 
-     assert distro.release_name == 'diamondback', distro.release_name
-     assert distro.version == 'r8596', distro.version
--    assert yaml.load(open(p)) == distro.raw_data, distro.raw_data
-+    assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data
-     assert set(distro.variants.keys()) == set(diamondback_variants)
-     assert set(distro.stacks.keys()) == set(diamondback_stacks), set(distro.stacks.keys()) ^ set(diamondback_stacks)
- 
-@@ -350,7 +350,7 @@ def test_load_distro_diamondback():
- 
- def test__load_variants():
-     from rospkg.distro import _load_variants
--    raw_data = yaml.load("""variants:
-+    raw_data = yaml.safe_load("""variants:
- - ros-base:
-     stacks: [ros, ros_comm]
- - ros-full: