From bfb7002d8f58aa5c3826d4daa728da6ae05eb71c Mon Sep 17 00:00:00 2001 From: noam-graetz <33254969+noam-graetz@users.noreply.github.com> Date: Sun, 10 Dec 2017 15:42:08 +0200 Subject: [PATCH 1/2] change from type() to isinstance()) type() check for exact match, which failed to detect the subclass used by WS4PY --- ws4py/server/cherrypyserver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ws4py/server/cherrypyserver.py b/ws4py/server/cherrypyserver.py index 34ff42e..690bc49 100644 --- a/ws4py/server/cherrypyserver.py +++ b/ws4py/server/cherrypyserver.py @@ -272,9 +272,9 @@ def _set_internal_flags(self): break _locals = current.f_locals if 'self' in _locals: - if type(_locals['self']) == HTTPRequest: + if isinstance(_locals['self'], HTTPRequest): _locals['self'].close_connection = True - if type(_locals['self']) == HTTPConnection: + if isinstance(_locals['self'], HTTPConnection): _locals['self'].linger = True # HTTPConnection is more inner than # HTTPRequest so we can leave once From 76d71e89306cbc63c0e236a243bf0bf135f6106f Mon Sep 17 00:00:00 2001 From: noam-graetz <33254969+noam-graetz@users.noreply.github.com> Date: Sun, 10 Dec 2017 15:58:06 +0200 Subject: [PATCH 2/2] fix indent of block --- ws4py/server/cherrypyserver.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ws4py/server/cherrypyserver.py b/ws4py/server/cherrypyserver.py index 690bc49..5b93465 100644 --- a/ws4py/server/cherrypyserver.py +++ b/ws4py/server/cherrypyserver.py @@ -272,14 +272,14 @@ def _set_internal_flags(self): break _locals = current.f_locals if 'self' in _locals: - if isinstance(_locals['self'], HTTPRequest): - _locals['self'].close_connection = True - if isinstance(_locals['self'], HTTPConnection): - _locals['self'].linger = True - # HTTPConnection is more inner than - # HTTPRequest so we can leave once - # we're done here - return + if isinstance(_locals['self'], HTTPRequest): + _locals['self'].close_connection = True + if isinstance(_locals['self'], HTTPConnection): + _locals['self'].linger = True + # HTTPConnection is more inner than + # HTTPRequest so we can leave once + # we're done here + return _locals = None current = current.f_back