From 5851badff1e9ad735c3d59933965ce121852946d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar <miroslav.stampar@gmail.com> Date: Tue, 3 Apr 2012 14:46:09 +0000 Subject: [PATCH] minor refactoring --- lib/parse/configfile.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/parse/configfile.py b/lib/parse/configfile.py index 880caf517..f8fe3a55b 100644 --- a/lib/parse/configfile.py +++ b/lib/parse/configfile.py @@ -12,6 +12,7 @@ import codecs from ConfigParser import MissingSectionHeaderError from lib.core.common import checkFile +from lib.core.common import unArrayizeValue from lib.core.common import UnicodeRawConfigParser from lib.core.data import conf from lib.core.data import logger @@ -87,15 +88,9 @@ def configFileParser(configFile): for family, optionData in optDict.items(): for option, datatype in optionData.items(): - boolean = False - integer = False + datatype = unArrayizeValue(datatype) - if isinstance(datatype, (list, tuple, set)): - datatype = datatype[0] - - if datatype == "boolean": - boolean = True - elif datatype == "integer": - integer = True + boolean = datatype == "boolean" + integer = datatype == "integer" configFileProxy(family, option, boolean, integer)