[MERGE] lp:~florent.x/openobject-addons/trunk-use-simplejson
bzr revid: al@openerp.com-20121218152110-aj4rxlzlovfp1qhw
This commit is contained in:
parent
0e77d66989
commit
32cd94c631
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
import base64
|
import base64
|
||||||
import hashlib
|
import hashlib
|
||||||
import json
|
import simplejson as json
|
||||||
import logging
|
import logging
|
||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
and reimport it.
|
and reimport it.
|
||||||
-
|
-
|
||||||
!python {model: edi.edi}: |
|
!python {model: edi.edi}: |
|
||||||
import json
|
import simplejson as json
|
||||||
res_partner = self.pool.get('res.partner')
|
res_partner = self.pool.get('res.partner')
|
||||||
doc = self.generate_edi(cr, uid, [res_partner.browse(cr, uid, ref('base.res_partner_2'))])
|
doc = self.generate_edi(cr, uid, [res_partner.browse(cr, uid, ref('base.res_partner_2'))])
|
||||||
edi_doc, = json.loads(doc)
|
edi_doc, = json.loads(doc)
|
||||||
|
@ -39,4 +39,4 @@
|
||||||
edi_doc_output, = json.loads(doc_output)
|
edi_doc_output, = json.loads(doc_output)
|
||||||
for attribute in ('__model', '__module', '__id', 'name', '__attachments'):
|
for attribute in ('__model', '__module', '__id', 'name', '__attachments'):
|
||||||
assert edi_doc_output.get(attribute) == edi_doc.get(attribute), \
|
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))
|
'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))
|
||||||
|
|
Loading…
Reference in New Issue