From b0bb19bd5eff8f2d0f56140bd7d6833f08c2ff0f Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Mon, 23 Nov 2015 11:14:12 -0600 Subject: [PATCH] Fix nested type deserialization for proto < 3 in cython PYTHON-215 --- cassandra/deserializers.pyx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cassandra/deserializers.pyx b/cassandra/deserializers.pyx index ffbb702a..061d340a 100644 --- a/cassandra/deserializers.pyx +++ b/cassandra/deserializers.pyx @@ -238,7 +238,7 @@ cdef list _deserialize_list_or_set(itemlen_t dummy_version, _unpack_len[itemlen_t](0, &numelements, buf) idx = sizeof(itemlen_t) - + protocol_version = max(3, protocol_version) for _ in range(numelements): subelem(buf, &elem_buf, &idx) result.append(from_binary(deserializer, &elem_buf, protocol_version)) @@ -325,6 +325,7 @@ cdef _deserialize_map(itemlen_t dummy_version, _unpack_len[itemlen_t](0, &numelements, buf) idx = sizeof(itemlen_t) themap = util.OrderedMapSerializedKey(key_type, protocol_version) + protocol_version = max(3, protocol_version) for _ in range(numelements): subelem(buf, &key_buf, &idx) subelem(buf, &val_buf, &idx)