diff --git a/clients/rospy/src/rospy/impl/tcpros_pubsub.py b/clients/rospy/src/rospy/impl/tcpros_pubsub.py index a30d1b6d7a..9344156784 100644 --- a/clients/rospy/src/rospy/impl/tcpros_pubsub.py +++ b/clients/rospy/src/rospy/impl/tcpros_pubsub.py @@ -242,7 +242,7 @@ def create_transport(self, resolved_name, pub_uri, protocol_params): if type(protocol_params) != list or len(protocol_params) != 3: return 0, "ERROR: invalid TCPROS parameters", 0 if protocol_params[0] != TCPROS: - return 0, "INTERNAL ERROR: protocol id is not TCPROS: %s"%id, 0 + return 0, "INTERNAL ERROR: protocol id is not TCPROS: %s"%protocol_params[0], 0 id, dest_addr, dest_port = protocol_params sub = rospy.impl.registration.get_topic_manager().get_subscriber_impl(resolved_name) diff --git a/clients/rospy/src/rospy/names.py b/clients/rospy/src/rospy/names.py index c6c4921259..8949dcb759 100644 --- a/clients/rospy/src/rospy/names.py +++ b/clients/rospy/src/rospy/names.py @@ -46,7 +46,7 @@ is_global, is_private import rosgraph.names -from rospy.exceptions import ROSException +from rospy.exceptions import ROSException, ROSInitException from rospy.impl.validators import ParameterInvalid TOPIC_ANYTYPE = ANYTYPE #indicates that a subscriber will connect any datatype given to it