From f7ca69af129e6575f82142f27fbf9054522e969d Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Fri, 29 Apr 2022 19:17:54 +0100 Subject: [PATCH] More robust handling of `to` and `room` arguments (Fixes #1771) --- src/flask_socketio/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flask_socketio/__init__.py b/src/flask_socketio/__init__.py index 42b1fc92..962d9906 100644 --- a/src/flask_socketio/__init__.py +++ b/src/flask_socketio/__init__.py @@ -434,7 +434,7 @@ def ping(): only be used when addressing an individual client. """ namespace = kwargs.pop('namespace', '/') - to = kwargs.pop('to', kwargs.pop('room', None)) + to = kwargs.pop('to', None) or kwargs.pop('room', None) include_self = kwargs.pop('include_self', True) skip_sid = kwargs.pop('skip_sid', None) if not include_self and not skip_sid: @@ -827,7 +827,7 @@ def handle_my_custom_event(json): namespace = flask.request.namespace callback = kwargs.get('callback') broadcast = kwargs.get('broadcast') - to = kwargs.pop('to', kwargs.pop('room', None)) + to = kwargs.pop('to', None) or kwargs.pop('room', None) if to is None and not broadcast: to = flask.request.sid include_self = kwargs.get('include_self', True) @@ -885,7 +885,7 @@ def send(message, **kwargs): namespace = flask.request.namespace callback = kwargs.get('callback') broadcast = kwargs.get('broadcast') - to = kwargs.pop('to', kwargs.pop('room', None)) + to = kwargs.pop('to', None) or kwargs.pop('room', None) if to is None and not broadcast: to = flask.request.sid include_self = kwargs.get('include_self', True)