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

Minor whitespace and layout tweaks, to reduce diff against 

upstream/master.
This commit is contained in:
Peter Åstrand (astrand) 2013-12-17 14:20:14 +01:00
parent f46db48399
commit 6de6933819
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
websockify/websocket.py
View File

@ -256,6 +256,7 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
return f return f
# #
# WebSocketRequestHandler logging/output functions # WebSocketRequestHandler logging/output functions
# #
@ -562,7 +563,8 @@ class WebSocketServer(object):
def __init__(self, RequestHandlerClass, listen_host='', def __init__(self, RequestHandlerClass, listen_host='',
listen_port=None, source_is_ipv6=False, listen_port=None, source_is_ipv6=False,
verbose=False, cert='', key='', ssl_only=None, verbose=False, cert='', key='', ssl_only=None,
daemon=False, record='', web='', file_only=False, daemon=False, record='', web='',
file_only=False,
run_once=False, timeout=0, idle_timeout=0, traffic=False, run_once=False, timeout=0, idle_timeout=0, traffic=False,
tcp_keepalive=True, tcp_keepcnt=None, tcp_keepidle=None, tcp_keepalive=True, tcp_keepcnt=None, tcp_keepidle=None,
tcp_keepintvl=None): tcp_keepintvl=None):
@ -809,7 +811,6 @@ class WebSocketServer(object):
# Return the WebSockets socket which may be SSL wrapped # Return the WebSockets socket which may be SSL wrapped
return retsock return retsock
# #
# WebSocketServer logging/output functions # WebSocketServer logging/output functions
# #
@ -1024,6 +1025,6 @@ class WebSocketServer(object):
# Restore signals # Restore signals
for sig, func in original_signals.items(): for sig, func in original_signals.items():
signal.signal(sig, func) signal.signal(sig, func)