From 0ca22dfbc22d89d33f37ff1661f24e6ea6654499 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 21 Jan 2009 17:01:42 +0000 Subject: Remove old properties implementation and hardwiring git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5036 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/TCheetah.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/lib/Server/Plugins/TCheetah.py') diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py index c2e632351..9806e5787 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Server/Plugins/TCheetah.py @@ -9,13 +9,11 @@ logger = logging.getLogger('Bcfg2.Plugins.TCheetah') class TemplateFile: '''Template file creates Cheetah template structures for the loaded file''' - def __init__(self, name, properties, specific, encoding): + def __init__(self, name, specific, encoding): self.name = name - self.properties = properties self.specific = specific self.encoding = encoding self.template = None - self.searchlist = {'properties': properties} def handle_event(self, event): '''Handle all fs events for this template''' @@ -24,9 +22,7 @@ class TemplateFile: try: s = {'useStackFrames': False} self.template = Cheetah.Template.Template(open(self.name).read(), - compilerSettings=s, - searchList = [self.searchlist]) - self.template.properties = self.properties.properties + compilerSettings=s) except Cheetah.Parser.ParseError, perror: logger.error("Cheetah parse error for file %s" % (self.name)) logger.error(perror.report()) @@ -62,4 +58,4 @@ class TCheetah(Bcfg2.Server.Plugin.GroupSpool): __author__ = 'bcfg-dev@mcs.anl.gov' filename_pattern = 'template' es_child_cls = TemplateFile - use_props = True + -- cgit v1.2.3-1-g7c22