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

@@ -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