Ticket #2104: websockify-new-import.patch

xpra/server/websocket.py

@@ -20 +20 @@
 
 WEBSOCKIFY_NUMPY = envbool("XPRA_WEBSOCKIFY_NUMPY", False)
 log("WEBSOCKIFY_NUMPY=%s", WEBSOCKIFY_NUMPY)
+def import_websockify_request_handler():
+    import websockify
+    assert websockify
+    try:
+        #websockify 0.8.0 and earlier:
+        from websockify.websocket import WebSocketRequestHandler    #@UnusedImport
+    except ImportError:
+        from websockify.websocketserver import WebSocketRequestHandler    #@UnusedImport
+    return WebSocketRequestHandler
 if WEBSOCKIFY_NUMPY:
-    from websockify.websocket import WebSocketRequestHandler    #@UnusedImport
+    WebSocketRequestHandler = import_websockify_request_handler()
 else:
+    import warnings
     from xpra.codecs.xor.cyxor import hybi_unmask
     with nomodule_context("numpy"):
-        from websockify.websocket import WebSocketRequestHandler    #@Reimport
-        def unmask(buf, hlen, plen):
-            pstart = hlen + 4
-            pend = pstart + plen
-            mask = buf[hlen:hlen+4]
-            data = buf[pstart:pend]
-            return hybi_unmask(mask, data)
-        WebSocketRequestHandler.unmask = staticmethod(unmask)
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
+            WebSocketRequestHandler = import_websockify_request_handler()
+            def unmask(buf, hlen, plen):
+                pstart = hlen + 4
+                pend = pstart + plen
+                mask = buf[hlen:hlen+4]
+                data = buf[pstart:pend]
+                return hybi_unmask(mask, data)
+            WebSocketRequestHandler.unmask = staticmethod(unmask)
+            #print warnings except for numpy:
+            for x in w:
+                message = getattr(x, "message", None)
+                if message:
+                    if str(message).find("numpy")>0:
+                        log("numpy warning suppressed: %s", message)
+                    else:
+                        log.warn("Warning: %s", message)
+                else:
+                    log.warn("Warning: %s", x)
 
+
 WEBSOCKET_TCP_NODELAY = envbool("WEBSOCKET_TCP_NODELAY", True)
 WEBSOCKET_TCP_KEEPALIVE = envbool("WEBSOCKET_TCP_KEEPALIVE", True)
 WEBSOCKET_DEBUG = envbool("XPRA_WEBSOCKET_DEBUG", False)
@@ -177 +200 @@
         and web server is enabled, SimpleHTTPRequestHandler.do_GET will be called.
         """
         if not self.handle_websocket():
-            if self.only_upgrade:
+            if getattr(self, "only_upgrade", False):
                 self.send_error(405, "Method Not Allowed")
             else:
                 content = self.send_head()
@@ -215 +238 @@
             else:
                 #self.send_error(403, "Directory listing forbidden")
                 return self.list_directory(path).read()
-        ctype = self.guess_type(path)
         _, ext = os.path.splitext(path)
         f = None
         try:
@@ -225 +247 @@
             f = open(path, 'rb')
             fs = os.fstat(f.fileno())
             content_length = fs[6]
-            headers = {
-                "Content-type"      : ctype,
-                }
+            headers = {}
+            ctype = None #self.guess_type(path)
+            if ctype:
+                headers["Content-type"] = ctype
             accept = self.headers.get('accept-encoding', '').split(",")
             accept = [x.split(";")[0].strip() for x in accept]
             content = None