From 32cd94c6318f3e6ed42ee55cafc487cc71d78523 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 18 Dec 2012 16:21:10 +0100 Subject: [PATCH] [MERGE] lp:~florent.x/openobject-addons/trunk-use-simplejson bzr revid: al@openerp.com-20121218152110-aj4rxlzlovfp1qhw --- addons/edi/models/edi.py | 2 +- addons/edi/test/edi_partner_test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py index 5f3589bd9d5..4d524e63818 100644 --- a/addons/edi/models/edi.py +++ b/addons/edi/models/edi.py @@ -21,7 +21,7 @@ import base64 import hashlib -import json +import simplejson as json import logging import re import time diff --git a/addons/edi/test/edi_partner_test.yml b/addons/edi/test/edi_partner_test.yml index 97ae669e52e..c5d5bd12e35 100644 --- a/addons/edi/test/edi_partner_test.yml +++ b/addons/edi/test/edi_partner_test.yml @@ -7,7 +7,7 @@ and reimport it. - !python {model: edi.edi}: | - import json + import simplejson as json res_partner = self.pool.get('res.partner') doc = self.generate_edi(cr, uid, [res_partner.browse(cr, uid, ref('base.res_partner_2'))]) edi_doc, = json.loads(doc) @@ -39,4 +39,4 @@ edi_doc_output, = json.loads(doc_output) for attribute in ('__model', '__module', '__id', 'name', '__attachments'): assert edi_doc_output.get(attribute) == edi_doc.get(attribute), \ - 'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute)) \ No newline at end of file + 'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))