encode UDT field names to avoid implicit conversion in formatting

aholmberg · aholmberg · commit 1a74af426c0f · 2015-10-29T10:29:41.000-05:00
PYTHON-353
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -1898,11 +1898,17 @@ def user_type_registered(self, keyspace, user_type, klass):
             raise UserTypeDoesNotExist(
                 'User type %s does not exist in keyspace %s' % (user_type, keyspace))
 
+        field_names = type_meta.field_names
+        if six.PY2:
+            # go from unicode to string to avoid decode errors from implicit
+            # decode when formatting non-ascii values
+            field_names = [fn.encode('utf-8') for fn in field_names]
+
         def encode(val):
             return '{ %s }' % ' , '.join('%s : %s' % (
                 field_name,
                 self.encoder.cql_encode_all_types(getattr(val, field_name, None))
-            ) for field_name in type_meta.field_names)
+            ) for field_name in field_names)
 
         self.encoder.mapping[klass] = encode
 
