From d38b5cb397964cfe9ebd79b94650bda533febf09 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Sat, 9 Mar 2019 23:49:50 +0200 Subject: [PATCH 1/2] bug fix of python imports --- Python/app/ChameleonVisionApp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/app/ChameleonVisionApp.py b/Python/app/ChameleonVisionApp.py index 0663ac4ce..b1f979578 100644 --- a/Python/app/ChameleonVisionApp.py +++ b/Python/app/ChameleonVisionApp.py @@ -2,8 +2,8 @@ import tornado.web import tornado.websocket import os -from handlers.MainHandler import MainHandler -from handlers.SocketHandler import ChameleonWebSocket +from .handlers.MainHandler import MainHandler +from .handlers.SocketHandler import ChameleonWebSocket from tornado.options import define define("port", default=8888, help="run on the given port", type=int) From c0b01f1013fb82c1bd72a0e5bae0545037e43869 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Sat, 9 Mar 2019 23:59:19 +0200 Subject: [PATCH 2/2] fixed websocket issue --- Python/app/ChameleonVisionApp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Python/app/ChameleonVisionApp.py b/Python/app/ChameleonVisionApp.py index b1f979578..73ee7c8ab 100644 --- a/Python/app/ChameleonVisionApp.py +++ b/Python/app/ChameleonVisionApp.py @@ -12,8 +12,8 @@ define("port", default=8888, help="run on the given port", type=int) class ChameleonApplication(tornado.web.Application): def __init__(self): handlers = [(r"/", MainHandler), - (r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}), (r"/websocket", ChameleonWebSocket), + (r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}), (r"/CSS/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/CSS")}), (r"/JS/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/JS")}), (r"/assets/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/assets")})]