[REM] useless intermediate lambdas in default values

bzr revid: xmo@openerp.com-20121102094705-6vcutz0bv4dc0jkl

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 8e40651..aacd6aa 100644 (file)
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -142,13 +142,13 @@ class report_xml(osv.osv):
 
     }
     _defaults = {
-        'type': lambda *a: 'ir.actions.report.xml',
-        'multi': lambda *a: False,
-        'auto': lambda *a: True,
-        'header': lambda *a: True,
-        'report_sxw_content': lambda *a: False,
-        'report_type': lambda *a: 'pdf',
-        'attachment': lambda *a: False,
+        'type': 'ir.actions.report.xml',
+        'multi': False,
+        'auto': True,
+        'header': True,
+        'report_sxw_content': False,
+        'report_type': 'pdf',
+        'attachment': False,
     }
 
 report_xml()
@@ -251,14 +251,14 @@ class act_window(osv.osv):
     }
 
     _defaults = {
-        'type': lambda *a: 'ir.actions.act_window',
-        'view_type': lambda *a: 'form',
-        'view_mode': lambda *a: 'tree,form',
-        'context': lambda *a: '{}',
-        'limit': lambda *a: 80,
-        'target': lambda *a: 'current',
-        'auto_refresh': lambda *a: 0,
-        'auto_search':lambda *a: True,
+        'type': 'ir.actions.act_window',
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'context': '{}',
+        'limit': 80,
+        'target': 'current',
+        'auto_refresh': 0,
+        'auto_search':True,
         'multi': False,
     }
 
@@ -298,7 +298,7 @@ class act_window_view(osv.osv):
             help="If set to true, the action will not be displayed on the right toolbar of a form view."),
     }
     _defaults = {
-        'multi': lambda *a: False,
+        'multi': False,
     }
     def _auto_init(self, cr, context=None):
         super(act_window_view, self)._auto_init(cr, context)
@@ -322,8 +322,8 @@ class act_wizard(osv.osv):
         'model': fields.char('Object', size=64),
     }
     _defaults = {
-        'type': lambda *a: 'ir.actions.wizard',
-        'multi': lambda *a: False,
+        'type': 'ir.actions.wizard',
+        'multi': False,
     }
 act_wizard()
 
@@ -344,8 +344,8 @@ class act_url(osv.osv):
         )
     }
     _defaults = {
-        'type': lambda *a: 'ir.actions.act_url',
-        'target': lambda *a: 'new'
+        'type': 'ir.actions.act_url',
+        'target': 'new'
     }
 act_url()
 
@@ -388,7 +388,7 @@ class server_object_lines(osv.osv):
         ], 'Type', required=True, size=32, change_default=True),
     }
     _defaults = {
-        'type': lambda *a: 'equation',
+        'type': 'equation',
     }
 server_object_lines()
 
@@ -490,11 +490,11 @@ class actions_server(osv.osv):
         'copy_object': fields.reference('Copy Of', selection=_select_objects, size=256),
     }
     _defaults = {
-        'state': lambda *a: 'dummy',
-        'condition': lambda *a: 'True',
-        'type': lambda *a: 'ir.actions.server',
-        'sequence': lambda *a: 5,
-        'code': lambda *a: """# You can use the following variables:
+        'state': 'dummy',
+        'condition': 'True',
+        'type': 'ir.actions.server',
+        'sequence': 5,
+        'code': """# You can use the following variables:
 #  - self: ORM model of the record on which the action is triggered
 #  - object: browse_record of the record on which the action is triggered if there is one, otherwise None
 #  - pool: ORM model pool (i.e. self.pool)
@@ -747,7 +747,7 @@ class act_window_close(osv.osv):
     _inherit = 'ir.actions.actions'
     _table = 'ir_actions'
     _defaults = {
-        'type': lambda *a: 'ir.actions.act_window_close',
+        'type': 'ir.actions.act_window_close',
     }
 act_window_close()
 

diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index dbc8927..243f4c7 100644 (file)
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -80,13 +80,13 @@ class ir_cron(osv.osv):
 
     _defaults = {
         'nextcall' : lambda *a: time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
-        'priority' : lambda *a: 5,
+        'priority' : 5,
         'user_id' : lambda obj,cr,uid,context: uid,
-        'interval_number' : lambda *a: 1,
-        'interval_type' : lambda *a: 'months',
-        'numbercall' : lambda *a: 1,
-        'active' : lambda *a: 1,
-        'doall' : lambda *a: 1
+        'interval_number' : 1,
+        'interval_type' : 'months',
+        'numbercall' : 1,
+        'active' : 1,
+        'doall' : 1
     }
 
     def _check_args(self, cr, uid, ids, context=None):

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 6099c68..1f5c142 100644 (file)
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -197,7 +197,7 @@ class ir_mail_server(osv.osv):
             logpiper = WriteToLogger(_logger)
             smtplib.stderr = logpiper
             smtplib.stdout = logpiper
-        return super(ir_mail_server, self).__init__(*args,**kwargs)
+        super(ir_mail_server, self).__init__(*args,**kwargs)
 
     def name_get(self, cr, uid, ids, context=None):
         return [(a["id"], "(%s)" % (a['name'])) for a in self.read(cr, uid, ids, ['name'], context=context)]

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index e477f2f..089eefb 100644 (file)
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -106,7 +106,7 @@ class ir_model(osv.osv):
     }
 
     _defaults = {
-        'model': lambda *a: 'x_',
+        'model': 'x_',
         'state': lambda self,cr,uid,ctx=None: (ctx and ctx.get('manual',False)) and 'manual' or 'base',
     }
 

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 868f634..2f2a610 100644 (file)
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -300,7 +300,7 @@ class view_sc(osv.osv):
 
     _order = 'sequence,name'
     _defaults = {
-        'resource': lambda *a: 'ir.ui.menu',
+        'resource': 'ir.ui.menu',
         'user_id': lambda obj, cr, uid, context: uid,
     }
     _sql_constraints = [

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index 3d6fce8..5dec919 100644 (file)
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -155,7 +155,7 @@ class res_partner_bank(osv.osv):
             cursor, user, 'country_id', context=context),
         'state_id': lambda obj, cursor, user, context: obj._default_value(
             cursor, user, 'state_id', context=context),
-        'name': lambda *args: '/'
+        'name': '/'
     }
 
     def fields_get(self, cr, uid, fields=None, context=None):

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index e371bd1..5732546 100644 (file)
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -51,8 +51,8 @@ class multi_company_default(osv.osv):
     }
 
     _defaults = {
-        'expression': lambda *a: 'True',
-        'sequence': lambda *a: 100,
+        'expression': 'True',
+        'sequence': 100,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):

diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 10a0b56..fa69919 100644 (file)
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -69,7 +69,7 @@ class res_currency(osv.osv):
         'position': fields.selection([('after','After Amount'),('before','Before Amount')], 'Symbol Position', help="Determines where the currency symbol should be placed after or before the amount.")
     }
     _defaults = {
-        'active': lambda *a: 1,
+        'active': 1,
         'position' : 'after',
         'rounding': 0.01,
         'accuracy': 4,

diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py
index 2b135a6..6c62877 100644 (file)
--- a/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@ -143,14 +143,14 @@ class lang(osv.osv):
         'thousands_sep':fields.char('Thousands Separator',size=64),
     }
     _defaults = {
-        'active': lambda *a: 1,
-        'translatable': lambda *a: 0,
-        'direction': lambda *a: 'ltr',
+        'active': 1,
+        'translatable': 0,
+        'direction': 'ltr',
         'date_format':_get_default_date_format,
         'time_format':_get_default_time_format,
-        'grouping':lambda *a: '[]',
-        'decimal_point':lambda *a: '.',
-        'thousands_sep':lambda *a: ',',
+        'grouping': '[]',
+        'decimal_point': '.',
+        'thousands_sep': ',',
     }
     _sql_constraints = [
         ('name_uniq', 'unique (name)', 'The name of the language must be unique !'),

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 10ce527..283d8ad 100644 (file)
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -135,7 +135,7 @@ class res_partner_category(osv.osv):
         (osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
     ]
     _defaults = {
-        'active': lambda *a: 1,
+        'active': 1,
     }
     _parent_store = True
     _parent_order = 'name'

diff --git a/openerp/addons/base/res/res_request.py b/openerp/addons/base/res/res_request.py
index 3b576c8..b1e3bf8 100644 (file)
--- a/openerp/addons/base/res/res_request.py
+++ b/openerp/addons/base/res/res_request.py
@@ -77,10 +77,10 @@ class res_request(osv.osv):
         'history': fields.one2many('res.request.history','req_id', 'History')
     }
     _defaults = {
-        'act_from': lambda obj,cr,uid,context={}: uid,
-        'state': lambda obj,cr,uid,context={}: 'draft',
-        'active': lambda obj,cr,uid,context={}: True,
-        'priority': lambda obj,cr,uid,context={}: '1',
+        'act_from': lambda obj,cr,uid,context=None: uid,
+        'state': 'draft',
+        'active': True,
+        'priority': '1',
     }
     _order = 'priority desc, trigger_date, create_date desc'
     _table = 'res_request'
@@ -94,7 +94,7 @@ class res_request_link(osv.osv):
         'priority': fields.integer('Priority'),
     }
     _defaults = {
-        'priority': lambda *a: 5,
+        'priority': 5,
     }
     _order = 'priority'
 res_request_link()
@@ -110,9 +110,9 @@ class res_request_history(osv.osv):
         'date_sent': fields.datetime('Date sent', states={'waiting':[('readonly',True)]}, required=True)
     }
     _defaults = {
-        'name': lambda *a: 'NoName',
-        'act_from': lambda obj,cr,uid,context={}: uid,
-        'act_to': lambda obj,cr,uid,context={}: uid,
+        'name': 'NoName',
+        'act_from': lambda obj,cr,uid,context=None: uid,
+        'act_to': lambda obj,cr,uid,context=None: uid,
         'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 res_request_history()