From 4a32d0b1f6606f75caa3fa92216432d79e574f6c Mon Sep 17 00:00:00 2001 From: Michal Staniaszek Date: Wed, 4 Nov 2020 10:44:29 +0000 Subject: [PATCH] remove obsolete load_manifest --- scripts/dynparam | 1 - src/dynamic_reconfigure/client.py | 4 ---- src/dynamic_reconfigure/encoding.py | 4 ---- src/dynamic_reconfigure/parameter_generator.py | 1 - src/dynamic_reconfigure/server.py | 4 ---- test/testclient.py | 1 - test/testserver.py | 1 - test/testserver_multiple_ns.py | 1 - 8 files changed, 17 deletions(-) diff --git a/scripts/dynparam b/scripts/dynparam index 8352a8af..e5a0d6c0 100755 --- a/scripts/dynparam +++ b/scripts/dynparam @@ -36,7 +36,6 @@ from __future__ import print_function NAME='dynparam' -import roslib; roslib.load_manifest('dynamic_reconfigure') import rospy import optparse import sys diff --git a/src/dynamic_reconfigure/client.py b/src/dynamic_reconfigure/client.py index fa18841b..9295bbff 100644 --- a/src/dynamic_reconfigure/client.py +++ b/src/dynamic_reconfigure/client.py @@ -37,10 +37,6 @@ from __future__ import print_function, with_statement -try: - import roslib; roslib.load_manifest('dynamic_reconfigure') -except Exception: - pass import rospy import sys import threading diff --git a/src/dynamic_reconfigure/encoding.py b/src/dynamic_reconfigure/encoding.py index 3b20fb4d..d6daa451 100644 --- a/src/dynamic_reconfigure/encoding.py +++ b/src/dynamic_reconfigure/encoding.py @@ -30,10 +30,6 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -try: - import roslib; roslib.load_manifest('dynamic_reconfigure') -except Exception: - pass import copy import sys diff --git a/src/dynamic_reconfigure/parameter_generator.py b/src/dynamic_reconfigure/parameter_generator.py index 08640ea2..c0ccfa3d 100644 --- a/src/dynamic_reconfigure/parameter_generator.py +++ b/src/dynamic_reconfigure/parameter_generator.py @@ -41,7 +41,6 @@ # Need to put sane error on exceptions from __future__ import print_function -import roslib; roslib.load_manifest("dynamic_reconfigure") import roslib.packages from string import Template import os diff --git a/src/dynamic_reconfigure/server.py b/src/dynamic_reconfigure/server.py index 04b83541..24b3495a 100644 --- a/src/dynamic_reconfigure/server.py +++ b/src/dynamic_reconfigure/server.py @@ -37,10 +37,6 @@ from __future__ import with_statement -try: - import roslib; roslib.load_manifest('dynamic_reconfigure') -except Exception: - pass import rospy import threading import copy diff --git a/test/testclient.py b/test/testclient.py index 4c2a2276..0f7752c7 100755 --- a/test/testclient.py +++ b/test/testclient.py @@ -32,7 +32,6 @@ # POSSIBILITY OF SUCH DAMAGE. from __future__ import print_function -import roslib; roslib.load_manifest('dynamic_reconfigure') import rospy from dynamic_reconfigure.client import Client as DynamicReconfigureClient import time diff --git a/test/testserver.py b/test/testserver.py index 22b47cc4..1b40a1a7 100755 --- a/test/testserver.py +++ b/test/testserver.py @@ -34,7 +34,6 @@ #********************************************************************/ from __future__ import print_function -import roslib; roslib.load_manifest('dynamic_reconfigure') import rospy import dynamic_reconfigure.server from dynamic_reconfigure.cfg import TestConfig diff --git a/test/testserver_multiple_ns.py b/test/testserver_multiple_ns.py index 6e794ce3..dd50fb88 100755 --- a/test/testserver_multiple_ns.py +++ b/test/testserver_multiple_ns.py @@ -34,7 +34,6 @@ #********************************************************************/ from __future__ import print_function -import roslib; roslib.load_manifest('dynamic_reconfigure') import rospy import dynamic_reconfigure.server from dynamic_reconfigure.cfg import TestConfig