diff --git a/odoo/addons/test_impex/tests/test_export.py b/odoo/addons/test_impex/tests/test_export.py index e80f6df0866..226ba9943f6 100644 --- a/odoo/addons/test_impex/tests/test_export.py +++ b/odoo/addons/test_impex/tests/test_export.py @@ -23,7 +23,7 @@ class CreatorCase(common.TransactionCase): def export(self, value, fields=('value',), context=None): record = self.make(value) record.invalidate_cache() - return record._BaseModel__export_rows([f.split('/') for f in fields]) + return record._export_rows([f.split('/') for f in fields]) class test_boolean_field(CreatorCase): @@ -449,7 +449,7 @@ class test_o2m_multiple(CreatorCase): def export(self, value=None, fields=('child1', 'child2',), context=None, **values): record = self.make(value, **values) - return record._BaseModel__export_rows([f.split('/') for f in fields]) + return record._export_rows([f.split('/') for f in fields]) def test_empty(self): self.assertEqual( diff --git a/odoo/models.py b/odoo/models.py index 9270782eadb..714cde7ff0b 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -738,7 +738,7 @@ class BaseModel(object): return '__export__.' + name @api.multi - def __export_rows(self, fields): + def _export_rows(self, fields): """ Export fields of the records in ``self``. :param fields: list of lists of fields to traverse @@ -785,7 +785,7 @@ class BaseModel(object): # recursively export the fields that follow name fields2 = [(p[1:] if p and p[0] == name else []) for p in fields] - lines2 = value.__export_rows(fields2) + lines2 = value._export_rows(fields2) if lines2: # merge first line with record's main line for j, val in enumerate(lines2[0]): @@ -804,6 +804,9 @@ class BaseModel(object): return lines + # backward compatibility + __export_rows = _export_rows + @api.multi def export_data(self, fields_to_export, raw_data=False): """ Export fields for selected objects @@ -817,7 +820,7 @@ class BaseModel(object): fields_to_export = map(fix_import_export_id_paths, fields_to_export) if raw_data: self = self.with_context(export_raw_data=True) - return {'datas': self.__export_rows(fields_to_export)} + return {'datas': self._export_rows(fields_to_export)} @api.model def load(self, fields, data):