odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] correct class name in case of multiple inheritance 

bzr revid: chs@tinyerp.com-20100112123431-af1t3s486aime7oy
This commit is contained in:
Christophe Simonis 2010-01-12 13:34:31 +01:00
parent a67e67d07e
commit 3a023ca1e4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/osv/osv.py
View File

@ -197,7 +197,6 @@ class osv_memory(osv_base, orm.orm_memory):
def createInstance(cls, pool, module, cr):
parent_names = getattr(cls, '_inherit', None)
if parent_names:
name = getattr(cls, '_name', cls._inherit)
for parent_name in ((type(parent_names)==list) and parent_names or [parent_names]):
parent_class = pool.get(parent_name).__class__
assert pool.get(parent_name), "parent class %s does not exist in module %s !" % (parent_name, module)
@ -209,7 +208,7 @@ class osv_memory(osv_base, orm.orm_memory):
else:
new.extend(cls.__dict__.get(s, []))
nattr[s] = new
name = getattr(cls, '_name', cls._inherit)
name = cls._name or cls._inherit
cls = type(name, (cls, parent_class), nattr)
obj = object.__new__(cls)
@ -246,8 +245,8 @@ class osv(osv_base, orm.orm):
new.append(c)
else:
new.extend(cls.__dict__.get(s, []))
nattr[s] = new
name = hasattr(cls, '_name') and cls._name or cls._inherit
nattr[s] = new
name = cls._name or cls._inherit
cls = type(name, (cls, parent_class), nattr)
obj = object.__new__(cls)
obj.__init__(pool, cr)