[Personalrobots-commit] SF.net SVN: personalrobots:[21372] pkg/trunk

[<sf...@us...>]

Revision: 21372
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21372&view=rev
Author:   sfkwc
Date:     2009-08-10 09:14:55 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Removing from robot_msgs import * everywhere

Modified Paths:
--------------
    pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml
    pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/arm_commander.py
    pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/settler.py
    pkg/trunk/calibration/joint_calibration_monitor/src/joint_calibration_monitor/generic_joint_monitor.py
    pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander_node.py
    pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander.py
    pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander_original.py
    pkg/trunk/calibration/kinematic_calibration/scripts/new_cmd_node.py
    pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/arm_commander.py
    pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/msg_cache.py
    pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/settler.py
    pkg/trunk/calibration/optical_flag_calibration/scripts/flag_tester.py
    pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py
    pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py
    pkg/trunk/controllers/robot_mechanism_controllers/scripts/tff.py
    pkg/trunk/controllers/robot_mechanism_controllers/scripts/wxeffect.py
    pkg/trunk/demos/arm_gazebo/scripts/l_arm_default.py
    pkg/trunk/demos/plug_in/fake_camera_frame.py
    pkg/trunk/demos/plug_in/fake_vision.py
    pkg/trunk/demos/plug_in/plug_in.py
    pkg/trunk/demos/plug_in/plug_in2.py
    pkg/trunk/demos/plug_in/spacenav_pass_through.py
    pkg/trunk/demos/plug_in_gazebo/scripts/set_plug.py
    pkg/trunk/demos/plug_in_gazebo/scripts/set_plug_on_base.py
    pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/assembler_node.py
    pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/laser_image_node.py
    pkg/trunk/drivers/robot/pr2/dense_laser_assembler/src/dense_laser_assembler/dense_laser_cache.py
    pkg/trunk/highlevel/executive_python/src/executive.py
    pkg/trunk/highlevel/executive_python/src/indefinite_nav.py
    pkg/trunk/highlevel/executive_python/src/office_nav.py
    pkg/trunk/mapping/annotated_planar_patch_map/test/dump_point_cloud_maps.py
    pkg/trunk/mapping/annotated_planar_patch_map/test/test_content.py
    pkg/trunk/mapping/annotated_planar_patch_map/test/test_projection.py
    pkg/trunk/pr2/cb_characterization/scripts/cmd_node.py
    pkg/trunk/pr2/life_test/arm_life_test/random_poses_right_cb.py
    pkg/trunk/pr2/life_test/arm_life_test/random_wrenches.py
    pkg/trunk/pr2/qualification/scripts/hysteresis_sinesweep_plot.py
    pkg/trunk/pr2/qualification/tests/ethernet_test/ethernet_test.py
    pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/executive_data_collector.py
    pkg/trunk/sandbox/person_follower/src/executive_data_collector.py
    pkg/trunk/sandbox/webteleop/src/server.py
    pkg/trunk/stacks/trex/trex_pr2/fake_battery_controller.py

Modified: pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml
===================================================================
--- pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/manifest.xml	2009-08-10 09:14:55 UTC (rev 21372)
@@ -17,6 +17,7 @@
   <depend package="move_base"/>
   <depend package="mux"/>
   <depend package="backup_safetysound"/>
+  <depend package="geometry_msgs"/>
 
   <!-- packages used in the test scripts -->
   <depend package="robot_actions"/>

Modified: pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/arm_commander.py
===================================================================
--- pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/arm_commander.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/arm_commander.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -40,7 +40,6 @@
 #from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 #from pr2_mechanism_controllers.msg import 
-from robot_msgs.msg import *
 from manipulation_msgs.msg import *
 
 class ArmCommander() :

Modified: pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/settler.py
===================================================================
--- pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/settler.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/auto_arm_commander/src/auto_arm_commander/settler.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -41,7 +41,6 @@
 
 from pr2_mechanism_controllers.srv import *\
 from mechanism_msgs.msg import MechanismState
-from robot_msgs.msg import *
 from roslib import rostime
 from auto_arm_commander.msg_cache import MsgCache
 

Modified: pkg/trunk/calibration/joint_calibration_monitor/src/joint_calibration_monitor/generic_joint_monitor.py
===================================================================
--- pkg/trunk/calibration/joint_calibration_monitor/src/joint_calibration_monitor/generic_joint_monitor.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/joint_calibration_monitor/src/joint_calibration_monitor/generic_joint_monitor.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -31,7 +31,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-from robot_msgs.msg import *
 from diagnostic_msgs.msg import *
 
 # Should these be constants in the Status msg?

Modified: pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander_node.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander_node.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/arm_commander_node.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -7,7 +7,6 @@
 from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 from pr2_mechanism_controllers.msg import *
-from robot_msgs.msg import *
 from mechanism_msgs import JointState, JointStates
 
 cmd_count = 0

Modified: pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -8,7 +8,6 @@
 from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 from pr2_mechanism_controllers.msg import *
-from robot_msgs.msg import *
 from mechanism_msgs.msg import MechanismState
 from kinematic_calibration.msg import *
 from manipulation_msgs.msg import *

Modified: pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander_original.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander_original.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/auto_arm_commander_original.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -8,7 +8,6 @@
 from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 from pr2_mechanism_controllers.msg import *
-from robot_msgs.msg import *
 from mechanism_msgs.msg import MechanismState
 from kinematic_calibration.msg import *
 from manipulation_msgs.msg import *

Modified: pkg/trunk/calibration/kinematic_calibration/scripts/new_cmd_node.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/new_cmd_node.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/new_cmd_node.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -8,7 +8,6 @@
 from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 from pr2_mechanism_controllers.msg import *
-from robot_msgs.msg import *
 from mechanism_msgs.msg import MechanismState
 from kinematic_calibration.msg import *
 

Modified: pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/arm_commander.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/arm_commander.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/arm_commander.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -40,7 +40,6 @@
 #from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 #from pr2_mechanism_controllers.msg import 
-from robot_msgs.msg import *
 from manipulation_msgs.msg import *
 
 

Modified: pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/msg_cache.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/msg_cache.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/msg_cache.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -39,11 +39,6 @@
 import sys
 import threading
 
-#from pr2_mechanism_controllers.srv import *
-
-#from robot_msgs.msg import *
-#from sensor_msgs.msg import *
-
 class MsgCache() :
     def __init__(self, max_len) :
         self._max_len = max_len

Modified: pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/settler.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/settler.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/kinematic_calibration/src/kinematic_calibration/settler.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -41,7 +41,6 @@
 
 from pr2_mechanism_controllers.srv import *
 from mechanism_msgs.msg import MechanismState
-from robot_msgs.msg import *
 from roslib import rostime
 from kinematic_calibration.msg_cache import MsgCache
 

Modified: pkg/trunk/calibration/optical_flag_calibration/scripts/flag_tester.py
===================================================================
--- pkg/trunk/calibration/optical_flag_calibration/scripts/flag_tester.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/calibration/optical_flag_calibration/scripts/flag_tester.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -8,7 +8,6 @@
 from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 from pr2_mechanism_controllers.msg import *
-from robot_msgs.msg import *
 from manipulation_msgs.msg import *
 
 cmd_count = 0

Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -24,7 +24,7 @@
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# POSSIBILITY OF SUCH DAMAGE.from robot_msgs.msg import *
 
 
 import roslib; roslib.load_manifest('pr2_mechanism_controllers')
@@ -34,7 +34,7 @@
 import rospy
 import sys
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from geometry_msgs.msg import PoseStamped
 
 pub = rospy.Publisher('/cartesian_pose/command', PoseStamped)
 

Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_trajectory.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -34,7 +34,7 @@
 import rospy
 import sys
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from geometry_msgs.msg import PoseStamped
 
 pub = rospy.Publisher('/cartesian_trajectory/command', PoseStamped)
 

Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/tff.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/tff.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/tff.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -34,7 +34,7 @@
 import rospy
 import sys
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from manipulation_msgs.msg import TaskFrameFormalism
 
 pub = rospy.Publisher('/cartesian_tff_right/command', TaskFrameFormalism)
 

Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/wxeffect.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/wxeffect.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/wxeffect.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -30,7 +30,6 @@
 import roslib; roslib.load_manifest(PKG)
 
 import rospy
-from robot_msgs.msg import *
 from mechanism_msgs.msg import MechanismState
 
 import wx

Modified: pkg/trunk/demos/arm_gazebo/scripts/l_arm_default.py
===================================================================
--- pkg/trunk/demos/arm_gazebo/scripts/l_arm_default.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/arm_gazebo/scripts/l_arm_default.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -49,9 +49,8 @@
 import sys, unittest
 import os, os.path, threading, time
 import rospy, rostest
-from robot_msgs.msg import *
-from std_msgs.msg import *
-from pr2_mechanism_controllers.msg import *
+from std_msgs.msg import FLoat64
+from pr2_mechanism_controllers.msg import JointPosCmd
 
 TEST_DURATION = 60.0
 COMMAND_INTERVAL = 5.0

Modified: pkg/trunk/demos/plug_in/fake_camera_frame.py
===================================================================
--- pkg/trunk/demos/plug_in/fake_camera_frame.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in/fake_camera_frame.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -28,8 +28,7 @@
 
 import roslib
 roslib.load_manifest('plug_in')
-import rospy
-from robot_msgs.msg import *
+import rospy:
 from tf.msg import tfMessage
 from math import *
 import time

Modified: pkg/trunk/demos/plug_in/fake_vision.py
===================================================================
--- pkg/trunk/demos/plug_in/fake_vision.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in/fake_vision.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -31,7 +31,7 @@
 
 import rospy
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from geometry_msgs.msg import Quaternion, PoseStamped
 from tf.msg import tfMessage
 from math import *
 from time import sleep

Modified: pkg/trunk/demos/plug_in/plug_in.py
===================================================================
--- pkg/trunk/demos/plug_in/plug_in.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in/plug_in.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -33,9 +33,8 @@
 import roslib
 roslib.load_manifest('plug_in')
 import rospy
-from robot_msgs.msg import *
-from robot_srvs.srv import *
-from deprecated_srvs.srv import *
+from geometry.msg import PoseStamped
+from robot_mechanism_controllers.srv import SetPoseStamped
 
 CONTROLLER = 'arm_constraint'
 

Modified: pkg/trunk/demos/plug_in/plug_in2.py
===================================================================
--- pkg/trunk/demos/plug_in/plug_in2.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in/plug_in2.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -34,9 +34,8 @@
 import roslib
 roslib.load_manifest('plug_in')
 import rospy
-from robot_msgs.msg import *
-from robot_srvs.srv import *
-from deprecated_srvs.srv import *
+from geometry_msgs.msg import PoseStamped
+from deprecated_srvs.srv import MoveToPose
 import tf.transformations
 import tf
 

Modified: pkg/trunk/demos/plug_in/spacenav_pass_through.py
===================================================================
--- pkg/trunk/demos/plug_in/spacenav_pass_through.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in/spacenav_pass_through.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -5,7 +5,7 @@
 
 import rospy
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from geometry_msgs.msg import Wrench
 from joy.msg import Joy
 
 rospy.init_node('wrencher', anonymous=True)

Modified: pkg/trunk/demos/plug_in_gazebo/scripts/set_plug.py
===================================================================
--- pkg/trunk/demos/plug_in_gazebo/scripts/set_plug.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in_gazebo/scripts/set_plug.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -47,7 +47,6 @@
 from std_msgs.msg import *
 from robot_actions.msg import *
 from nav_robot_actions.msg import *
-from robot_msgs.msg import *
 from tf.transformations import *
 from geometry_msgs.msg import Twist, PoseWithRatesStamped
 from numpy import *

Modified: pkg/trunk/demos/plug_in_gazebo/scripts/set_plug_on_base.py
===================================================================
--- pkg/trunk/demos/plug_in_gazebo/scripts/set_plug_on_base.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/demos/plug_in_gazebo/scripts/set_plug_on_base.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -47,7 +47,6 @@
 from std_msgs.msg import *
 from robot_actions.msg import *
 from nav_robot_actions.msg import *
-from robot_msgs.msg import *
 from tf.transformations import *
 from geometry_msgs.msg import Twist, PoseWithRatesStamped
 from numpy import *

Modified: pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/assembler_node.py
===================================================================
--- pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/assembler_node.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/assembler_node.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -40,7 +40,7 @@
 import threading
 from time import sleep
 from sensor_msgs.msg import LaserScan
-from robot_msgs.msg import *
+from pr2_msgs import LaserScannerSignal
 from mechanism_msgs.msg import MechanismState
 from std_msgs.msg import *
 from dense_laser_assembler.msg import *

Modified: pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/laser_image_node.py
===================================================================
--- pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/laser_image_node.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/drivers/robot/pr2/dense_laser_assembler/scripts/laser_image_node.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -39,11 +39,10 @@
 import rospy
 from time import sleep
 from laser_scan.msg import *
-from robot_msgs.msg import *
 from std_msgs.msg import *
 from dense_laser_assembler.msg import *
 from pr2_mechanism_controllers.msg import *
-from sensor_msgs.msg import *
+from sensor_msgs.msg import Image
 
 
 # Takes the dense laser scan data and converts it into images to can be viewed in

Modified: pkg/trunk/drivers/robot/pr2/dense_laser_assembler/src/dense_laser_assembler/dense_laser_cache.py
===================================================================
--- pkg/trunk/drivers/robot/pr2/dense_laser_assembler/src/dense_laser_assembler/dense_laser_cache.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/drivers/robot/pr2/dense_laser_assembler/src/dense_laser_assembler/dense_laser_cache.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -39,8 +39,6 @@
 import sys
 import threading
 from laser_scan.msg import *
-from robot_msgs.msg import *
-from mechanism_msgs.msg import MechanismState
 from roslib import rostime
 
 # Stores a single laser scan plus some meta information

Modified: pkg/trunk/highlevel/executive_python/src/executive.py
===================================================================
--- pkg/trunk/highlevel/executive_python/src/executive.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/highlevel/executive_python/src/executive.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -38,10 +38,6 @@
 roslib.load_manifest('executive_python')
 import rospy
 import random
-from std_msgs.msg import *
-from robot_msgs.msg import *
-from std_msgs.msg import *
-from robot_msgs.msg import *
 from battery_monitor_adapter import *
 from navigation_adapter import *
 from stuck_adapter import *

Modified: pkg/trunk/highlevel/executive_python/src/indefinite_nav.py
===================================================================
--- pkg/trunk/highlevel/executive_python/src/indefinite_nav.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/highlevel/executive_python/src/indefinite_nav.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -38,8 +38,6 @@
 roslib.load_manifest('executive_python')
 import rospy
 import random
-from std_msgs.msg import *
-from robot_msgs.msg import *
 from battery_monitor_adapter import *
 from recharge_adapter import *
 from navigation_adapter import *

Modified: pkg/trunk/highlevel/executive_python/src/office_nav.py
===================================================================
--- pkg/trunk/highlevel/executive_python/src/office_nav.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/highlevel/executive_python/src/office_nav.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -38,8 +38,6 @@
 roslib.load_manifest('executive_python')
 import rospy
 import random
-from std_msgs.msg import *
-from robot_msgs.msg import *
 from battery_monitor_adapter import *
 from recharge_adapter import *
 from navigation_adapter import *

Modified: pkg/trunk/mapping/annotated_planar_patch_map/test/dump_point_cloud_maps.py
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/test/dump_point_cloud_maps.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/mapping/annotated_planar_patch_map/test/dump_point_cloud_maps.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -40,7 +40,7 @@
 import random
 from annotated_map_msgs.msg import *
 
-from robot_msgs.msg import *
+from mapping_msgs.msg import PolygonalMap
 
 
 import os

Modified: pkg/trunk/mapping/annotated_planar_patch_map/test/test_content.py
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/test/test_content.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/mapping/annotated_planar_patch_map/test/test_content.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -42,7 +42,6 @@
 import unittest
 from pr2_mechanism_controllers.msg import LaserScannerSignal
 from annotated_map_msgs.msg import *
-from robot_msgs.msg import *
 from roslib.msg import *
 import tf
 from cv_mech_turk.msg import ExternalAnnotation

Modified: pkg/trunk/mapping/annotated_planar_patch_map/test/test_projection.py
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/test/test_projection.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/mapping/annotated_planar_patch_map/test/test_projection.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -40,7 +40,6 @@
 import unittest
 from pr2_mechanism_controllers.msg import LaserScannerSignal
 from annotated_map_msgs.msg import *
-from robot_msgs.msg import *
 from roslib.msg import *
 import tf
 from cv_mech_turk.msg import ExternalAnnotation

Modified: pkg/trunk/pr2/cb_characterization/scripts/cmd_node.py
===================================================================
--- pkg/trunk/pr2/cb_characterization/scripts/cmd_node.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/pr2/cb_characterization/scripts/cmd_node.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -8,7 +8,6 @@
 from std_msgs.msg import Empty
 from pr2_mechanism_controllers.srv import *
 from pr2_mechanism_controllers.msg import *
-from robot_msgs.msg import *
 from mechanism_msgs.msg import MechanismState
 
 from auto_arm_commander.settler import *

Modified: pkg/trunk/pr2/life_test/arm_life_test/random_poses_right_cb.py
===================================================================
--- pkg/trunk/pr2/life_test/arm_life_test/random_poses_right_cb.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/pr2/life_test/arm_life_test/random_poses_right_cb.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -32,7 +32,7 @@
 import random, time
 import rospy
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from geometry_msgs.msg import PoseStamped
 
 pub = rospy.Publisher('r_arm_cartesian_pose_controller/command', PoseStamped)
 

Modified: pkg/trunk/pr2/life_test/arm_life_test/random_wrenches.py
===================================================================
--- pkg/trunk/pr2/life_test/arm_life_test/random_wrenches.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/pr2/life_test/arm_life_test/random_wrenches.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -34,7 +34,7 @@
 import rospy
 import sys
 from std_msgs.msg import *
-from robot_msgs.msg import *
+from geometry_msgs.msg import Wrench
 
 pub = rospy.Publisher('/r_arm_cartesian_wrench_controller/command', Wrench)
 

Modified: pkg/trunk/pr2/qualification/scripts/hysteresis_sinesweep_plot.py
===================================================================
--- pkg/trunk/pr2/qualification/scripts/hysteresis_sinesweep_plot.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/pr2/qualification/scripts/hysteresis_sinesweep_plot.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -34,7 +34,6 @@
 
 import numpy
 import math
-from robot_msgs.msg import *
 from std_msgs.msg import *
 from robot_srvs.srv import *
 

Modified: pkg/trunk/pr2/qualification/tests/ethernet_test/ethernet_test.py
===================================================================
--- pkg/trunk/pr2/qualification/tests/ethernet_test/ethernet_test.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/pr2/qualification/tests/ethernet_test/ethernet_test.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -34,8 +34,6 @@
 import roslib
 roslib.load_manifest('qualification')
 
-from robot_msgs.msg import *
-from robot_srvs.srv import *
 from qualification.msg import *
 from qualification.srv import *
 

Modified: pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/executive_data_collector.py
===================================================================
--- pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/executive_data_collector.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/executive_data_collector.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -39,10 +39,8 @@
 import rospy
 import sys
 import random
-from std_msgs.msg import *
-from robot_msgs.msg import *
-from std_msgs.msg import *
-from robot_msgs.msg import *
+from deprecated_msgs import JointCmd
+
 from stereo_msgs.msg import RawStereo
 
 import tf

Modified: pkg/trunk/sandbox/person_follower/src/executive_data_collector.py
===================================================================
--- pkg/trunk/sandbox/person_follower/src/executive_data_collector.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/sandbox/person_follower/src/executive_data_collector.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -39,10 +39,6 @@
 import rospy
 import sys
 import random
-from std_msgs.msg import *
-from robot_msgs.msg import *
-from std_msgs.msg import *
-from robot_msgs.msg import *
 from stereo_msgs.msg import RawStereo
 from mechanism_msgs.msg import JointStates, JointState
 

Modified: pkg/trunk/sandbox/webteleop/src/server.py
===================================================================
--- pkg/trunk/sandbox/webteleop/src/server.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/sandbox/webteleop/src/server.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -30,7 +30,6 @@
 from nav_msgs import *
 from nav_msgs.msg import *
 from std_msgs.msg import *
-from robot_msgs.msg import *
 from geometry_msgs.msg import *
 
 tfclient = None

Modified: pkg/trunk/stacks/trex/trex_pr2/fake_battery_controller.py
===================================================================
--- pkg/trunk/stacks/trex/trex_pr2/fake_battery_controller.py	2009-08-10 09:12:53 UTC (rev 21371)
+++ pkg/trunk/stacks/trex/trex_pr2/fake_battery_controller.py	2009-08-10 09:14:55 UTC (rev 21372)
@@ -44,7 +44,7 @@
 import time
 
 import rospy
-from robot_msgs.msg import *
+from pr2_msgs import BatteryState
 
 def talker():
     pub = rospy.Publisher("battery_state", BatteryState)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.