From a805fa6a4464165c393afc592d01d00754109ea2 Mon Sep 17 00:00:00 2001 From: Andre D Date: Fri, 24 Aug 2012 12:20:19 -0500 Subject: [PATCH] tdb_cassandra: Fix unicode error in deserialization --- r2/r2/lib/db/tdb_cassandra.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r2/r2/lib/db/tdb_cassandra.py b/r2/r2/lib/db/tdb_cassandra.py index 838e74d70..53936c432 100644 --- a/r2/r2/lib/db/tdb_cassandra.py +++ b/r2/r2/lib/db/tdb_cassandra.py @@ -486,7 +486,7 @@ class ThingBase(object): return val # otherwise we'll assume that it's a utf-8 string - return val.decode('utf-8') + return val if isinstance(val, unicode) else val.decode('utf-8') @classmethod def _serialize_column(cls, attr, val):