From 698c3dc7e689cf07b623506053f290ee9ed593a6 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 14 Oct 2015 23:40:40 +0200 Subject: [PATCH] When empty array or dictionary were passed for data, an uncatched TypeError exception was raised. --- socketio/packet.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/socketio/packet.py b/socketio/packet.py index 642e179..f349aae 100644 --- a/socketio/packet.py +++ b/socketio/packet.py @@ -135,17 +135,25 @@ class Packet(object): else: return data + + + + + def _data_is_binary(self, data): """Check if the data contains binary components.""" - if isinstance(data, six.binary_type): - return True - elif isinstance(data, list): - return functools.reduce( - lambda a, b: a or b, [self._data_is_binary(item) - for item in data]) - elif isinstance(data, dict): - return functools.reduce( - lambda a, b: a or b, [self._data_is_binary(item) - for item in six.itervalues(data)]) - else: + try: + if isinstance(data, six.binary_type): + return True + elif isinstance(data, list): + return functools.reduce( + lambda a, b: a or b, [self._data_is_binary(item) + for item in data]) + elif isinstance(data, dict): + return functools.reduce( + lambda a, b: a or b, [self._data_is_binary(item) + for item in six.itervalues(data)]) + else: + return False + except TypeError: return False