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

small cleanups and a beautiful new whitespace in output... ;)

Browse source
This commit is contained in:
Johannes Findeisen 2013-08-14 21:57:58 +02:00
commit bee99d74d1
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/config/parser.py
View file

@ -1,8 +1,6 @@
from os.path import isfile from os.path import isfile
from os.path import join from os.path import join
from os import getcwd
import json import json
import sys
import imp import imp
from layouts import Layout from layouts import Layout
from hostgroups import HostGroup from hostgroups import HostGroup
@ -13,7 +11,6 @@ from lib.services.service import Service
from lib.processors.processor import Processor from lib.processors.processor import Processor
from lib.parsers.parser import Parser from lib.parsers.parser import Parser
from lib.tasks.task import Task from lib.tasks.task import Task
from argparse import Namespace
MOD_SERVICES = "services" MOD_SERVICES = "services"
MOD_PROCESSORS = "processors" MOD_PROCESSORS = "processors"
@ -145,7 +142,7 @@ class ConfigParser:
except KeyError, k: except KeyError, k:
self.log.w("Key " + str(k) + " not in classItem " + str(clazzItem)) self.log.w("Key " + str(k) + " not in classItem " + str(clazzItem))
except Exception, e: except Exception, e:
self.log.w("Error while replacing class ( " + clazz + " ):" + str(e)) self.log.w("Error while replacing class ( " + clazz + " ): " + str(e))
del items[:] del items[:]
items.extend(repl) items.extend(repl)
@ -237,8 +234,6 @@ class FullConfigParser(ConfigParser):
items_func = lambda service: service.get_parser() items_func = lambda service: service.get_parser()
class_check = lambda parser: isinstance(parser, Parser) class_check = lambda parser: isinstance(parser, Parser)
self.replace_with_import(services, MOD_PARSERS, items_func, class_check) self.replace_with_import(services, MOD_PARSERS, items_func, class_check)
#replace object pointer #replace object pointer
id_list_func = lambda hostgroup: hostgroup.get_members() id_list_func = lambda hostgroup: hostgroup.get_members()