[FIX] removed use of magic methods/attributes, plus some useless code duplication
bzr revid: odo@openerp.com-20100503233516-85tk5wr61ip2agw5
This commit is contained in:
parent
b1d4680359
commit
e05850f9e1
|
@ -267,8 +267,7 @@ class YamlInterpreter(object):
|
|||
import osv
|
||||
record, fields = node.items()[0]
|
||||
model = self.get_model(record.model)
|
||||
model_bases = model.__class__.__bases__
|
||||
if osv.osv.osv_memory in model_bases:
|
||||
if isinstance(model, osv.osv.osv_memory):
|
||||
record_dict=self.create_osv_memory_record(record, fields)
|
||||
else:
|
||||
self.validate_xml_id(record.id)
|
||||
|
@ -282,14 +281,12 @@ class YamlInterpreter(object):
|
|||
if not self._coerce_bool(record.forcecreate):
|
||||
return None
|
||||
|
||||
model = self.get_model(record.model)
|
||||
record_dict = self._create_record(model, fields)
|
||||
self.logger.debug("RECORD_DICT %s" % record_dict)
|
||||
if not osv.osv.osv_memory in model_bases:
|
||||
id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
|
||||
self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
|
||||
self.id_map[record.id] = int(id)
|
||||
if config.get('import_partial', False):
|
||||
if config.get('import_partial'):
|
||||
self.cr.commit()
|
||||
|
||||
def _create_record(self, model, fields):
|
||||
|
|
Loading…
Reference in New Issue