fixed NoSQL Json, thanks Alan

2013-03-25 15:25:29 -05:00
parent 30ea9ac56b
commit b15211064d
2 changed files with 9 additions and 8 deletions
@@ -1 +1 @@
-Version 2.4.5-stable+timestamp.2013.03.21.15.09.50
+Version 2.4.5-stable+timestamp.2013.03.25.15.24.28
@@ -4364,13 +4364,14 @@ class NoSQLAdapter(BaseAdapter):
            elif fieldtype == 'blob':
                pass
            elif fieldtype == 'json':
-                obj = self.to_unicode(obj)
-                if have_serializers:
-                    obj = serializers.loads_json(obj)
-                elif simplejson:
-                    obj = simplejson.loads(obj)
-                else:
-                    raise RuntimeError("missing simplejson")
+                if isinstance(obj, basestring):
+                    obj = self.to_unicode(obj)
+                    if have_serializers:
+                        obj = serializers.loads_json(obj)
+                    elif simplejson:
+                        obj = simplejson.loads(obj)
+                    else:
+                        raise RuntimeError("missing simplejson")
            elif is_string and field_is_type('list:string'):
                return map(self.to_unicode,obj)
            elif is_list: