robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed imports after Routing merge

Browse source
This commit is contained in:
Philip Trauner 2016-11-16 18:47:44 +01:00
parent 9ae687e35d
commit 80f984ab28
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Server/Server.py
View file

@ -1,5 +1,4 @@
import Logging import Logging
import Routing
import Config import Config
from .Broadcast import Broadcast from .Broadcast import Broadcast
@ -16,10 +15,10 @@ from wsgiref.simple_server import make_server
from ws4py.server.wsgirefserver import WSGIServer, WebSocketWSGIRequestHandler from ws4py.server.wsgirefserver import WSGIServer, WebSocketWSGIRequestHandler
from ws4py.server.wsgiutils import WebSocketWSGIApplication from ws4py.server.wsgiutils import WebSocketWSGIApplication
from Highway import Server from Highway import Server, Route
class Info(Routing.Route): class Info(Route):
def run(self, data, handler): def run(self, data, handler):
handler.send({"routes" : list(handler.routes.keys())}, "info") handler.send({"routes" : list(handler.routes.keys())}, "info")
@ -65,7 +64,7 @@ class Compile:
class StdStream(Routing.Route): class StdStream(Route):
def __init__(self): def __init__(self):
self.stream_to = {} self.stream_to = {}
@ -80,7 +79,7 @@ class StdStream(Routing.Route):
class Subscribe(Routing.Route): class Subscribe(Route):
EDITOR = 1 EDITOR = 1
WALLABY = 2 WALLABY = 2
WEB = 3 WEB = 3