linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renamed function

Browse source
This commit is contained in:
Johannes Findeisen 2013-10-19 02:10:38 +02:00
commit a7312cb37e
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
linspector/config/parser.py
View file

@ -75,7 +75,7 @@ class ConfigParser:
for layout in config.get_layouts(): for layout in config.get_layouts():
layout._to_config_dict(configDict) layout._to_config_dict(configDict)
def _read_json_config(self, configFilename): def _read_config_file(self, configFilename):
""" """
reads the config File and returns a dictionary, while lowering the first keys reads the config File and returns a dictionary, while lowering the first keys
@ -229,8 +229,7 @@ class FullConfigParser(ConfigParser):
:param configFilename: the configuration file to parse :param configFilename: the configuration file to parse
""" """
self.dict = self._read_config_file(configFilename)
self.dict = self._read_json_config(configFilename)
# first step # first step
creator = lambda name, values: Layout(name, **values) creator = lambda name, values: Layout(name, **values)
@ -239,7 +238,6 @@ class FullConfigParser(ConfigParser):
creator = lambda name, values: Member(name, **values) creator = lambda name, values: Member(name, **values)
members = self._create_raw_Object(self.dict[KEY_MEMBERS], "Member", creator) members = self._create_raw_Object(self.dict[KEY_MEMBERS], "Member", creator)
creator = lambda name, values: HostGroup(name, **values) creator = lambda name, values: HostGroup(name, **values)
self.hostgroups = self._create_raw_Object(self.dict[KEY_HOSTGROUPS], "Hostgroup", creator) self.hostgroups = self._create_raw_Object(self.dict[KEY_HOSTGROUPS], "Hostgroup", creator)