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

[IMP] fields: remove attribute `_free_attrs` and use `_attrs` instead 

This saves about 400Kb per registry by not allocating those lists, which are in
most cases empty.  The removal of the attribute will also simplify a bit the
management of free attributes.
This commit is contained in:
Raphael Collet 2015-03-10 11:58:12 +01:00
parent 9aad3d873b
commit 4d232969a3
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openerp/fields.py
View File

@ -253,8 +253,9 @@ class Field(object):
""" """
__metaclass__ = MetaField __metaclass__ = MetaField
_attrs = None # dictionary with all field attributes _attrs = None # dictionary of field attributes; it contains:
_free_attrs = None # list of semantic-free attribute names # - all attributes after __init__()
# - free attributes only after set_class_name()
automatic = False # whether the field is automatically created ("magic" field) automatic = False # whether the field is automatically created ("magic" field)
inherited = False # whether the field is inherited (_inherits) inherited = False # whether the field is inherited (_inherits)
@ -295,7 +296,6 @@ class Field(object):
def __init__(self, string=None, **kwargs): def __init__(self, string=None, **kwargs):
kwargs['string'] = string kwargs['string'] = string
self._attrs = {key: val for key, val in kwargs.iteritems() if val is not None} self._attrs = {key: val for key, val in kwargs.iteritems() if val is not None}
self._free_attrs = []
# self._triggers is a set of pairs (field, path) that represents the # self._triggers is a set of pairs (field, path) that represents the
# computed fields that depend on `self`. When `self` is modified, it # computed fields that depend on `self`. When `self` is modified, it
@ -337,9 +337,10 @@ class Field(object):
if not isinstance(attrs.get('column'), (NoneType, fields.function)): if not isinstance(attrs.get('column'), (NoneType, fields.function)):
attrs.pop('store', None) attrs.pop('store', None)
self._attrs = {}
for attr, value in attrs.iteritems(): for attr, value in attrs.iteritems():
if not hasattr(self, attr): if not hasattr(self, attr):
self._free_attrs.append(attr) self._attrs[attr] = value
setattr(self, attr, value) setattr(self, attr, value)
if not self.string and not self.related: if not self.string and not self.related:
@ -478,10 +479,10 @@ class Field(object):
if not getattr(self, attr): if not getattr(self, attr):
setattr(self, attr, getattr(field, prop)) setattr(self, attr, getattr(field, prop))
for attr in field._free_attrs: for attr, value in field._attrs.iteritems():
if attr not in self._free_attrs: if attr not in self._attrs:
self._free_attrs.append(attr) self._attrs[attr] = value
setattr(self, attr, getattr(field, attr)) setattr(self, attr, value)
# special case for states: copy it only for inherited fields # special case for states: copy it only for inherited fields
if not self.states and self.inherited: if not self.states and self.inherited:
@ -648,8 +649,8 @@ class Field(object):
args = {} args = {}
for attr, prop in self.column_attrs: for attr, prop in self.column_attrs:
args[attr] = getattr(self, prop) args[attr] = getattr(self, prop)
for attr in self._free_attrs: for attr, value in self._attrs.iteritems():
args[attr] = getattr(self, attr) args[attr] = value
if self.company_dependent: if self.company_dependent:
# company-dependent fields are mapped to former property fields # company-dependent fields are mapped to former property fields