From e6d8d8f242fb6c39867749aff8d8e20e9bbc11b8 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Fri, 21 Sep 2012 07:08:04 -0500 Subject: [PATCH] Gracefully handle errors when popping kwargs. https://github.com/kanaka/websockify/pull/53 --- websockify/websocketproxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py index 13f6582..c792dbf 100755 --- a/websockify/websocketproxy.py +++ b/websockify/websocketproxy.py @@ -41,13 +41,13 @@ Traffic Legend: def __init__(self, *args, **kwargs): # Save off proxy specific options - self.target_host = kwargs.pop('target_host') - self.target_port = kwargs.pop('target_port') - self.wrap_cmd = kwargs.pop('wrap_cmd') - self.wrap_mode = kwargs.pop('wrap_mode') - self.unix_target = kwargs.pop('unix_target') - self.ssl_target = kwargs.pop('ssl_target') - self.target_cfg = kwargs.pop('target_cfg') + self.target_host = kwargs.pop('target_host', None) + self.target_port = kwargs.pop('target_port', None) + self.wrap_cmd = kwargs.pop('wrap_cmd', None) + self.wrap_mode = kwargs.pop('wrap_mode', None) + self.unix_target = kwargs.pop('unix_target', None) + self.ssl_target = kwargs.pop('ssl_target', None) + self.target_cfg = kwargs.pop('target_cfg', None) # Last 3 timestamps command was run self.wrap_times = [0, 0, 0]