From b5ee13a8450b7429dd4235507ed6f44def581baf Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 11 Oct 2011 10:03:38 +0200 Subject: [PATCH] [IMP] rename serialize_o2m_commands to resolve_o2m_commands_to_record_dicts bzr revid: xmo@openerp.com-20111011080338-hup42vivlvk4dly0 --- openerp/addons/base/res/res_bank.py | 2 +- openerp/osv/orm.py | 2 +- tests/test_orm.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index 5e96a7ecc04..ce1cd1c6a24 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -108,7 +108,7 @@ class res_partner_bank(osv.osv): if not context.get('address'): return value - for address in self.pool.get('res.partner').serialize_o2m_commands( + for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts( cursor, user, 'address', context['address'], ['type', field], context=context): if address.get('type') == 'default': diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 07329a301fd..a17eb49e8b3 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -4762,7 +4762,7 @@ class BaseModel(object): return True - def serialize_o2m_commands(self, cr, uid, field_name, o2m_commands, fields=None, context=None): + def resolve_o2m_commands_to_record_dicts(self, cr, uid, field_name, o2m_commands, fields=None, context=None): """ Serializes o2m commands into record dictionaries (as if all the o2m records came from the database via a read()), and returns an iterator over these dictionaries. diff --git a/tests/test_orm.py b/tests/test_orm.py index 67b97b894d6..365ac95ee4d 100644 --- a/tests/test_orm.py +++ b/tests/test_orm.py @@ -24,13 +24,13 @@ class TestO2MSerialization(unittest2.TestCase): def test_no_command(self): " empty list of commands yields an empty list of records " - results = list(self.partner.serialize_o2m_commands(self.cr, UID, 'address', [])) + results = list(self.partner.resolve_o2m_commands_to_record_dicts(self.cr, UID, 'address', [])) self.assertEqual(results, []) def test_CREATE_commands(self): " returns the VALUES dict as-is " - results = list(self.partner.serialize_o2m_commands( + results = list(self.partner.resolve_o2m_commands_to_record_dicts( self.cr, UID, 'address', map(CREATE, [{'foo': 'bar'}, {'foo': 'baz'}, {'foo': 'baq'}]))) self.assertEqual(results, [ @@ -48,7 +48,7 @@ class TestO2MSerialization(unittest2.TestCase): ] commands = map(LINK_TO, ids) - results = list(self.partner.serialize_o2m_commands(self.cr, UID, 'address', commands, ['name'])) + results = list(self.partner.resolve_o2m_commands_to_record_dicts(self.cr, UID, 'address', commands, ['name'])) self.assertEqual(results, [ {'id': ids[0], 'name': 'foo'}, @@ -64,7 +64,7 @@ class TestO2MSerialization(unittest2.TestCase): self.address.create(self.cr, UID, {'name': 'baz'}) ] - results = list(self.partner.serialize_o2m_commands(self.cr, UID, 'address', ids, ['name'])) + results = list(self.partner.resolve_o2m_commands_to_record_dicts(self.cr, UID, 'address', ids, ['name'])) self.assertEqual(results, [ {'id': ids[0], 'name': 'foo'}, @@ -78,7 +78,7 @@ class TestO2MSerialization(unittest2.TestCase): id_bar = self.address.create(self.cr, UID, {'name': 'bar'}) id_baz = self.address.create(self.cr, UID, {'name': 'baz', 'city': 'tag'}) - results = list(self.partner.serialize_o2m_commands( + results = list(self.partner.resolve_o2m_commands_to_record_dicts( self.cr, UID, 'address', [ LINK_TO(id_foo), UPDATE(id_bar, {'name': 'qux', 'city': 'tagtag'}), @@ -97,7 +97,7 @@ class TestO2MSerialization(unittest2.TestCase): for name in ['NObar', 'baz', 'qux', 'NOquux', 'NOcorge', 'garply'] ] - results = list(self.partner.serialize_o2m_commands( + results = list(self.partner.resolve_o2m_commands_to_record_dicts( self.cr, UID, 'address', [ CREATE({'name': 'foo'}), UPDATE(ids[0], {'name': 'bar'}),