Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'

* commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49': Fix search path construction in tests.
2013-11-28 09:14:25 +01:00
parent 602248425a 13c99bcf05
commit 81e2a53692
3 changed files with 6 additions and 7 deletions
@@ -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):
    """