Merge 230a1ccc96 into f3a0ce06a9

websockify/token_plugins.py

@@ -34,9 +34,9 @@ class ReadOnlyTokenFile(BasePlugin):
         if self._targets is None:
             self._load_targets()
 
-        if token in self._targets:
+        try:
             return self._targets[token]
-        else:
+        except KeyError:
             return None
 
 

websockify/websocketproxy.py

@@ -122,7 +122,7 @@ Traffic Legend:
         # in the form of token: host:port
 
         # Extract the token parameter from url
-        args = parse_qs(urlparse(path)[4]) # 4 is the query from url
+        args = parse_qs(urlparse(path).query)
 
         if not 'token' in args or not len(args['token']):
             raise self.server.EClose("Token not present")
@@ -166,9 +166,9 @@ Traffic Legend:
                 ins, outs, excepts = select.select(rlist, wlist, [], 1)
             except (select.error, OSError):
                 exc = sys.exc_info()[1]
-                if hasattr(exc, 'errno'):
+                try:
                     err = exc.errno
-                else:
+                except AttributeError:
                     err = exc[0]
 
                 if err != errno.EINTR: