From 0c46cbcfcc1390f07e015a6ccbcc263fbd0a5ddd Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 6 May 2011 16:34:37 +0000 Subject: [PATCH] merge from 0.8 git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100275 13f79535-47bb-0310-9956-ffa450edef68 --- drivers/py/cql/decoders.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/py/cql/decoders.py b/drivers/py/cql/decoders.py index 76036a1938..e22703d7f5 100644 --- a/drivers/py/cql/decoders.py +++ b/drivers/py/cql/decoders.py @@ -59,11 +59,11 @@ class SchemaDecoder(object): unmarshal = unmarshallers.get(comparator, unmarshal_noop) values = [key] for column in row.columns: - if column.value == None: - continue - description.append((unmarshal(column.name), comparator, None, None, None, None, True)) validator = self.__validator_for(keyspace, column_family, column.name) - values.append(unmarshallers.get(validator, unmarshal_noop)(column.value)) + if column.value is None: + values.append(None) + else: + values.append(unmarshallers.get(validator, unmarshal_noop)(column.value)) return description, values