From 94676e6aac35c3592a5ff2f8e5b8b6ed53f05eda Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Mon, 27 Nov 2017 09:48:02 -0800 Subject: [PATCH] node is not imported in __init__.py anymore --- rclpy/executors/examples_rclpy_executors/callback_group.py | 3 ++- rclpy/executors/examples_rclpy_executors/listener.py | 7 ++++--- rclpy/executors/examples_rclpy_executors/talker.py | 7 ++++--- .../minimal_client/client_async_member_function.py | 3 ++- rclpy/services/minimal_service/service_member_function.py | 3 ++- .../topics/minimal_publisher/publisher_member_function.py | 3 ++- .../minimal_subscriber/subscriber_member_function.py | 3 ++- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/rclpy/executors/examples_rclpy_executors/callback_group.py b/rclpy/executors/examples_rclpy_executors/callback_group.py index 605aac38..e44f2638 100644 --- a/rclpy/executors/examples_rclpy_executors/callback_group.py +++ b/rclpy/executors/examples_rclpy_executors/callback_group.py @@ -16,10 +16,11 @@ import rclpy from rclpy.callback_groups import MutuallyExclusiveCallbackGroup from rclpy.executors import MultiThreadedExecutor +from rclpy.node import Node from std_msgs.msg import String -class DoubleTalker(rclpy.Node): +class DoubleTalker(Node): """Publish messages to a topic using two publishers at different rates.""" def __init__(self): diff --git a/rclpy/executors/examples_rclpy_executors/listener.py b/rclpy/executors/examples_rclpy_executors/listener.py index 194af75f..96438106 100644 --- a/rclpy/executors/examples_rclpy_executors/listener.py +++ b/rclpy/executors/examples_rclpy_executors/listener.py @@ -13,20 +13,21 @@ # limitations under the License. import rclpy +from rclpy.node import Node from std_msgs.msg import String -class Listener(rclpy.Node): +class Listener(Node): """ A node with a single subscriber. This class creates a node which prints messages it receives on a topic. Creating a node by - inheriting from rclpy.Node is recommended because it allows it to be imported and used by + inheriting from Node is recommended because it allows it to be imported and used by other scripts. """ def __init__(self): - # Calls rclpy.Node.__init__('listener') + # Calls Node.__init__('listener') super().__init__('listener') self.sub = self.create_subscription(String, 'chatter', self.chatter_callback) diff --git a/rclpy/executors/examples_rclpy_executors/talker.py b/rclpy/executors/examples_rclpy_executors/talker.py index 8f9eb85e..d5e2c364 100644 --- a/rclpy/executors/examples_rclpy_executors/talker.py +++ b/rclpy/executors/examples_rclpy_executors/talker.py @@ -13,20 +13,21 @@ # limitations under the License. import rclpy +from rclpy.node import Node from std_msgs.msg import String -class Talker(rclpy.Node): +class Talker(Node): """ A node with a single publisher. This class creates a node which regularly publishes messages on a topic. Creating a node by - inheriting from rclpy.Node is recommended because it allows it to be imported and used by + inheriting from Node is recommended because it allows it to be imported and used by other scripts. """ def __init__(self): - # Calls rclpy.Node.__init__('talker') + # Calls Node.__init__('talker') super().__init__('talker') self.i = 0 self.pub = self.create_publisher(String, 'chatter') diff --git a/rclpy/services/minimal_client/client_async_member_function.py b/rclpy/services/minimal_client/client_async_member_function.py index 996fdd7c..f716e68f 100644 --- a/rclpy/services/minimal_client/client_async_member_function.py +++ b/rclpy/services/minimal_client/client_async_member_function.py @@ -17,9 +17,10 @@ from example_interfaces.srv import AddTwoInts import rclpy +from rclpy.node import Node -class MinimalClientAsync(rclpy.Node): +class MinimalClientAsync(Node): def __init__(self): super().__init__('minimal_client_async') diff --git a/rclpy/services/minimal_service/service_member_function.py b/rclpy/services/minimal_service/service_member_function.py index 2a991d90..e47a4aa7 100644 --- a/rclpy/services/minimal_service/service_member_function.py +++ b/rclpy/services/minimal_service/service_member_function.py @@ -15,9 +15,10 @@ from example_interfaces.srv import AddTwoInts import rclpy +from rclpy.node import Node -class MinimalService(rclpy.Node): +class MinimalService(Node): def __init__(self): super().__init__('minimal_service') diff --git a/rclpy/topics/minimal_publisher/publisher_member_function.py b/rclpy/topics/minimal_publisher/publisher_member_function.py index 4ed3ed3e..a1b0875c 100644 --- a/rclpy/topics/minimal_publisher/publisher_member_function.py +++ b/rclpy/topics/minimal_publisher/publisher_member_function.py @@ -13,11 +13,12 @@ # limitations under the License. import rclpy +from rclpy.node import Node from std_msgs.msg import String -class MinimalPublisher(rclpy.Node): +class MinimalPublisher(Node): def __init__(self): super().__init__('minimal_publisher') diff --git a/rclpy/topics/minimal_subscriber/subscriber_member_function.py b/rclpy/topics/minimal_subscriber/subscriber_member_function.py index 4580a9c0..c43778a8 100644 --- a/rclpy/topics/minimal_subscriber/subscriber_member_function.py +++ b/rclpy/topics/minimal_subscriber/subscriber_member_function.py @@ -13,11 +13,12 @@ # limitations under the License. import rclpy +from rclpy.node import Node from std_msgs.msg import String -class MinimalSubscriber(rclpy.Node): +class MinimalSubscriber(Node): def __init__(self): super().__init__('minimal_subscriber')