crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pythonize code

This commit is contained in:
Ceesjan Luiten 2015-10-06 10:48:38 +02:00
parent 50cc65f1e4
commit 230a1ccc96
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websockify/token_plugins.py
View File

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

6
websockify/websocketproxy.py
View File

@ -108,7 +108,7 @@ Traffic Legend:
# in the form of token: host:port # in the form of token: host:port
# Extract the token parameter from url # 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']): if not 'token' in args or not len(args['token']):
raise self.server.EClose("Token not present") raise self.server.EClose("Token not present")
@ -152,9 +152,9 @@ Traffic Legend:
ins, outs, excepts = select.select(rlist, wlist, [], 1) ins, outs, excepts = select.select(rlist, wlist, [], 1)
except (select.error, OSError): except (select.error, OSError):
exc = sys.exc_info()[1] exc = sys.exc_info()[1]
if hasattr(exc, 'errno'): try:
err = exc.errno err = exc.errno
else: except AttributeError:
err = exc[0] err = exc[0]
if err != errno.EINTR: if err != errno.EINTR: