Merge pull request #13 from 130s/12_use_rosbridge_tools

Replace rosbridge_server (addresses #12).
tork-a · Dec 28, 2014 · de2d9e0 · de2d9e0
2 parents a5f3a6b + cb36607
commit de2d9e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/package.xml b/package.xml
@@ -13,7 +13,7 @@
   <url type="repository">https://github.com/tork-a/roswww_pkg</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>rosbridge_server</run_depend>
+  <run_depend>rosbridge_tools</run_depend>
   <run_depend>rospy</run_depend>
 
   <export/>

diff --git a/script/webserver.py b/script/webserver.py
@@ -36,9 +36,9 @@
 
 import socket
 import subprocess
-import tornado.ioloop  # rosbridge installs tornado
-import tornado.web
 
+from rosbridge_tools import find_tornado
+tornado = find_tornado()
 import rospy
 
 from roswww.webrequest_handler import WebRequestHandler

diff --git a/src/roswww/webrequest_handler.py b/src/roswww/webrequest_handler.py
@@ -34,7 +34,8 @@
 #
 # Author: Jonathan Mace, Jihoon Lee, Isaac Isao Saito
 
-import tornado.web
+from rosbridge_tools import find_tornado
+tornado = find_tornado()
 
 
 class WebRequestHandler(tornado.web.RequestHandler):