From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/roslaunch/files/40roslaunch | 1 + dev-ros/roslaunch/files/py3-2.patch | 29 ---------------------- dev-ros/roslaunch/files/py3.patch | 45 ----------------------------------- dev-ros/roslaunch/files/timeout.patch | 18 -------------- dev-ros/roslaunch/files/yaml.patch | 44 ---------------------------------- 5 files changed, 1 insertion(+), 136 deletions(-) delete mode 100644 dev-ros/roslaunch/files/py3-2.patch delete mode 100644 dev-ros/roslaunch/files/py3.patch delete mode 100644 dev-ros/roslaunch/files/timeout.patch delete mode 100644 dev-ros/roslaunch/files/yaml.patch (limited to 'dev-ros/roslaunch/files') diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch index 1e8f4dadcf29..e9dac18dd65f 100644 --- a/dev-ros/roslaunch/files/40roslaunch +++ b/dev-ros/roslaunch/files/40roslaunch @@ -1 +1,2 @@ ROS_MASTER_URI="http://localhost:11311/" +ROS_DISTRO=Gentoo diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch deleted file mode 100644 index d3ae600e4d7e..000000000000 --- a/dev-ros/roslaunch/files/py3-2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001 -From: Dirk Thomas -Date: Tue, 6 Aug 2019 16:06:51 -0700 -Subject: [PATCH] more Python 3 compatibility (#1783) - ---- - test/test_rospy/test/unit/test_genmsg_py.py | 6 +-- - tools/rosgraph/src/rosgraph/roslogging.py | 2 +- - .../test/test_roslogging_user_logger.py | 8 +++- - tools/roslaunch/test/unit/test_xmlloader.py | 2 +- - tools/rosmsg/src/rosmsg/__init__.py | 2 +- - tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++---------- - .../test/test_rosmsgproto_command_line.py | 20 ++++---- - .../test_rostopic_command_line_offline.py | 44 +++++++++--------- - 8 files changed, 67 insertions(+), 63 deletions(-) - -diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py -index ac30189d0..f582ec230 100644 ---- a/tools/roslaunch/test/unit/test_xmlloader.py -+++ b/tools/roslaunch/test/unit/test_xmlloader.py -@@ -218,7 +218,7 @@ def test_params(self): - p = [p for p in mock.params if p.key == '/configfile'][0] - self.assertEquals(contents, p.value, 1) - p = [p for p in mock.params if p.key == '/binaryfile'][0] -- self.assertEquals(Binary(contents), p.value, 1) -+ self.assertEquals(Binary(contents.encode()), p.value, 1) - - f = open(os.path.join(get_example_path(), 'example.launch')) - try: diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch deleted file mode 100644 index 8fa2c6e2fab2..000000000000 --- a/dev-ros/roslaunch/files/py3.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001 -From: Dirk Thomas -Date: Tue, 6 Aug 2019 12:50:24 -0700 -Subject: [PATCH] more Python 3 compatibility (#1782) - ---- - test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +- - test/test_rosmaster/test/nodes/testMaster | 2 +- - test/test_rosmaster/test/nodes/testSlave | 2 +- - test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++- - tools/rosgraph/test/test_roslogging.py | 5 ++++- - tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++- - tools/roslaunch/src/roslaunch/depends.py | 8 ++++---- - 7 files changed, 22 insertions(+), 10 deletions(-) - -diff --git a/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py -index a3fbf7a41..91ae26998 100644 ---- a/tools/roslaunch/src/roslaunch/depends.py -+++ b/tools/roslaunch/src/roslaunch/depends.py -@@ -86,21 +86,21 @@ def __str__(self): - - def _get_arg_value(tag, context): - name = tag.attributes['name'].value -- if tag.attributes.has_key('value'): -+ if 'value' in tag.attributes.keys(): - return resolve_args(tag.attributes['value'].value, context) - elif name in context['arg']: - return context['arg'][name] -- elif tag.attributes.has_key('default'): -+ elif 'default' in tag.attributes.keys(): - return resolve_args(tag.attributes['default'].value, context) - else: - raise RoslaunchDepsException("No value for arg [%s]"%(name)) - - def _check_ifunless(tag, context): -- if tag.attributes.has_key('if'): -+ if 'if' in tag.attributes.keys(): - val = resolve_args(tag.attributes['if'].value, context) - if not convert_value(val, 'bool'): - return False -- elif tag.attributes.has_key('unless'): -+ elif 'unless' in tag.attributes.keys(): - val = resolve_args(tag.attributes['unless'].value, context) - if convert_value(val, 'bool'): - return False diff --git a/dev-ros/roslaunch/files/timeout.patch b/dev-ros/roslaunch/files/timeout.patch deleted file mode 100644 index 169b12813c70..000000000000 --- a/dev-ros/roslaunch/files/timeout.patch +++ /dev/null @@ -1,18 +0,0 @@ -Slow HW like the raspberry pi easily hit this timeout over NFS. -Increase it to 1 min. - -diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py -index 9a3b931..8e33c0c 100644 ---- a/tools/roslaunch/src/roslaunch/launch.py -+++ b/tools/roslaunch/src/roslaunch/launch.py -@@ -57,8 +57,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener - - from roslaunch.rlutil import update_terminal_name - --_TIMEOUT_MASTER_START = 10.0 #seconds --_TIMEOUT_MASTER_STOP = 10.0 #seconds -+_TIMEOUT_MASTER_START = 60.0 #seconds -+_TIMEOUT_MASTER_STOP = 60.0 #seconds - - _ID = '/roslaunch' - diff --git a/dev-ros/roslaunch/files/yaml.patch b/dev-ros/roslaunch/files/yaml.patch deleted file mode 100644 index 135e9927c408..000000000000 --- a/dev-ros/roslaunch/files/yaml.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: roslaunch/src/roslaunch/loader.py -=================================================================== ---- roslaunch.orig/src/roslaunch/loader.py -+++ roslaunch/src/roslaunch/loader.py -@@ -98,7 +98,7 @@ def convert_value(value, type_): - raise ValueError("%s is not a '%s' type"%(value, type_)) - elif type_ == 'yaml': - try: -- return yaml.load(value) -+ return yaml.safe_load(value) - except yaml.parser.ParserError as e: - raise ValueError(e) - else: -@@ -409,7 +409,7 @@ class Loader(object): - if rosparam is None: - import rosparam - try: -- data = yaml.load(text) -+ data = yaml.safe_load(text) - # #3162: if there is no YAML, load() will return an - # empty string. We want an empty dictionary instead - # for our representation of empty. -Index: roslaunch/test/unit/test_roslaunch_dump_params.py -=================================================================== ---- roslaunch.orig/test/unit/test_roslaunch_dump_params.py -+++ roslaunch/test/unit/test_roslaunch_dump_params.py -@@ -53,7 +53,7 @@ class TestDumpParams(unittest.TestCase): - o, e = p.communicate() - self.assert_(p.returncode == 0, "Return code nonzero for param dump! Code: %d" % (p.returncode)) - -- self.assertEquals({'/noop': 'noop'}, yaml.load(o)) -+ self.assertEquals({'/noop': 'noop'}, yaml.safe_load(o)) - - p = Popen([cmd, '--dump-params', 'roslaunch', 'test-dump-rosparam.launch'], stdout = PIPE) - o, e = p.communicate() -@@ -95,7 +95,7 @@ class TestDumpParams(unittest.TestCase): - '/noparam1': 'value1', - '/noparam2': 'value2', - } -- output_val = yaml.load(o) -+ output_val = yaml.safe_load(o) - if not val == output_val: - for k, v in val.items(): - if k not in output_val: -- cgit v1.2.3