Samus CTO (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-simplify-boolean-in-config-files-cto
into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-simplify-boolean-in-config-files-cto/+merge/98832
Simplify the boolean detection while parsing config.
Just use the already implemented method against our bad way.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-simplify-boolean-in-config-files-cto/+merge/98832
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-simplify-boolean-in-config-files-cto.
=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py 2012-03-02 11:28:34 +0000
+++ openerp/tools/config.py 2012-03-22 12:29:21 +0000
@@ -359,14 +359,6 @@
or os.environ.get('OPENERP_SERVER') or rcfilepath)
self.load()
-
- # Verify that we want to log or not, if not the output will go to stdout
- if self.options['logfile'] in ('None', 'False'):
- self.options['logfile'] = False
- # the same for the pidfile
- if self.options['pidfile'] in ('None', 'False'):
- self.options['pidfile'] = False
-
# if defined dont take the configfile value even if the defined value is None
keys = ['xmlrpc_interface', 'xmlrpc_port', 'db_name', 'db_user', 'db_password', 'db_host',
'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout',
@@ -542,24 +534,24 @@
p = ConfigParser.ConfigParser()
try:
p.read([self.rcfile])
- for (name,value) in p.items('options'):
- if value=='True' or value=='true':
- value = True
- if value=='False' or value=='false':
- value = False
- self.options[name] = value
+ for key in p.options('options'):
+ try:
+ self.options[key] = p.getboolean('options', key)
+ except ValueError:
+ self.options[key] = p.get('options', key)
+ if self.options[key].lower()=='none': self.options[key] = None
#parse the other sections, as well
for sec in p.sections():
if sec == 'options':
continue
if not self.misc.has_key(sec):
self.misc[sec]= {}
- for (name, value) in p.items(sec):
- if value=='True' or value=='true':
- value = True
- if value=='False' or value=='false':
- value = False
- self.misc[sec][name] = value
+ for key in p.options(sec):
+ try:
+ self.misc[sec][key] = p.getboolean(sec, key)
+ except ValueError:
+ self.misc[sec][key] = p.get(sec, key)
+ if self.misc[sec][key].lower()=='none': self.misc[sec][key] = None
except IOError:
pass
except ConfigParser.NoSectionError:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
