Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'
* commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49': Fix search path construction in tests.
This commit is contained in:
commit
81e2a53692
|
@ -11,8 +11,8 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
|
|||
'''
|
||||
|
||||
import os, sys, select, optparse
|
||||
sys.path.insert(0,os.path.dirname(__file__) + "/../websockify")
|
||||
from websocket import WebSocketServer, WebSocketRequestHandler
|
||||
sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
|
||||
from websockify.websocket import WebSocketServer, WebSocketRequestHandler
|
||||
|
||||
class WebSocketEcho(WebSocketRequestHandler):
|
||||
"""
|
||||
|
|
|
@ -7,8 +7,8 @@ given a sequence number. Any errors are reported and counted.
|
|||
'''
|
||||
|
||||
import sys, os, select, random, time, optparse
|
||||
sys.path.insert(0,os.path.dirname(__file__) + "/../websockify")
|
||||
from websocket import WebSocketServer, WebSocketRequestHandler
|
||||
sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
|
||||
from websockify.websocket import WebSocketServer, WebSocketRequestHandler
|
||||
|
||||
class WebSocketLoadServer(WebSocketServer):
|
||||
|
||||
|
|
|
@ -5,9 +5,8 @@ Display UTF-8 encoding for 0-255.'''
|
|||
|
||||
import sys, os, socket, ssl, time, traceback
|
||||
from select import select
|
||||
|
||||
sys.path.insert(0,os.path.dirname(__file__) + "/../websockify")
|
||||
from websocket import WebSocketServer
|
||||
sys.path.insert(0,os.path.join(os.path.dirname(__file__), ".."))
|
||||
from websockify.websocket import WebSocketServer
|
||||
|
||||
if __name__ == '__main__':
|
||||
print "val: hybi_base64 | hybi_binary"
|
||||
|
|
Loading…
Reference in New Issue