# HG changeset patch # User cavaliet # Date 1412087610 -7200 # Node ID f12604e7a91cd9b07c70e91810e8be72667c9e2b # Parent fd70d49eab27ddabb80e408febec6dd8e76e60ae v1.53.11 : debug cinelab serializer diff -r fd70d49eab27 -r f12604e7a91c src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Thu Sep 18 15:35:43 2014 +0200 +++ b/src/ldt/ldt/__init__.py Tue Sep 30 16:33:30 2014 +0200 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 53, 10, "final", 0) +VERSION = (1, 53, 11, "final", 0) def get_version(): diff -r fd70d49eab27 -r f12604e7a91c src/ldt/ldt/api/ldt/serializers/cinelabserializer.py --- a/src/ldt/ldt/api/ldt/serializers/cinelabserializer.py Thu Sep 18 15:35:43 2014 +0200 +++ b/src/ldt/ldt/api/ldt/serializers/cinelabserializer.py Tue Sep 30 16:33:30 2014 +0200 @@ -1,5 +1,4 @@ from django.conf import settings -from django.core.serializers import json from django.utils import simplejson from ldt.ldt_utils.models import Content, Project from ldt.ldt_utils.projectserializer import ProjectJsonSerializer @@ -7,6 +6,7 @@ from ldt.utils.url import reverse_prefix from tastypie.exceptions import NotFound, BadRequest from tastypie.serializers import Serializer +import json import lxml.etree import math @@ -37,7 +37,7 @@ if isinstance(data.obj, Project) : ps = ProjectJsonSerializer(data.obj) data = ps.serialize_to_cinelab() - return simplejson.dumps(data, cls=json.DjangoJSONEncoder, sort_keys=True, indent=self.json_indent) + return json.dumps(data, sort_keys=True, indent=self.json_indent) raise NotFound("Project not found")