Merge pull request #15 from tork-a/revert-13-12_use_rosbridge_tools

Revert "Replace rosbridge_server (addresses #12)."
tork-a · Jan 5, 2015 · 5c7c89e · 5c7c89e
2 parents de2d9e0 + 4266f67
commit 5c7c89e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 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_tools</run_depend>
+  <run_depend>rosbridge_server</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,8 +34,7 @@
 #
 # Author: Jonathan Mace, Jihoon Lee, Isaac Isao Saito
 
-from rosbridge_tools import find_tornado
-tornado = find_tornado()
+import tornado.web
 
 
 class WebRequestHandler(tornado.web.RequestHandler):