From 36a968f5a2bb817b3ed9a7028b5a970ff86754b9 Mon Sep 17 00:00:00 2001 From: Sebastien Maillard Date: Thu, 10 Dec 2015 19:27:12 +0800 Subject: [PATCH] Use default timeout in get_param directly Conflicts: dead_mans_switch_client/models/dead_mans_switch_client.py --- dead_mans_switch_client/models/dead_mans_switch_client.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dead_mans_switch_client/models/dead_mans_switch_client.py b/dead_mans_switch_client/models/dead_mans_switch_client.py index f05949965..728ce4ff9 100644 --- a/dead_mans_switch_client/models/dead_mans_switch_client.py +++ b/dead_mans_switch_client/models/dead_mans_switch_client.py @@ -64,9 +64,7 @@ class DeadMansSwitchClient(orm.AbstractModel): logger.error('No server configured!') return timeout = self.env['ir.config_parameter'].get_param( - 'dead_mans_switch_client.send_timeout') - if not timeout: - timeout = SEND_TIMEOUT + 'dead_mans_switch_client.send_timeout', SEND_TIMEOUT) data = self._get_data(cr, uid, context=context) logger.debug('sending %s', data) urllib2.urlopen(