Options: migrated plugins to new options parser

1 files changed, 11 insertions, 8 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
index e056c871a..7ba8c4491 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
@@ -5,9 +5,9 @@
 import re
 import sys
 import traceback
+import Bcfg2.Options
 from Bcfg2.Server.Plugin import PluginExecutionError, removecomment
 from Bcfg2.Server.Plugins.Cfg import CfgGenerator
-
 from genshi.template import TemplateLoader, NewTextTemplate
 from genshi.template.eval import UndefinedError, Suite
 
@@ -70,8 +70,8 @@ class CfgGenshiGenerator(CfgGenerator):
     #: occurred.
     pyerror_re = re.compile(r'<\w+ u?[\'"](.*?)\s*\.\.\.[\'"]>')
 
-    def __init__(self, fname, spec, encoding):
-        CfgGenerator.__init__(self, fname, spec, encoding)
+    def __init__(self, fname, spec):
+        CfgGenerator.__init__(self, fname, spec)
         self.template = None
         self.loader = self.__loader_cls__(max_cache_size=0)
     __init__.__doc__ = CfgGenerator.__init__.__doc__
@@ -87,13 +87,15 @@ class CfgGenshiGenerator(CfgGenerator):
             metadata=metadata,
             path=self.name,
             source_path=self.name,
-            repo=self.setup['repo']).filter(removecomment)
+            repo=Bcfg2.Options.setup.repository).filter(removecomment)
         try:
             try:
-                return stream.render('text', encoding=self.encoding,
+                return stream.render('text',
+                                     encoding=Bcfg2.Options.setup.encoding,
                                      strip_whitespace=False)
             except TypeError:
-                return stream.render('text', encoding=self.encoding)
+                return stream.render('text',
+                                     encoding=Bcfg2.Options.setup.encoding)
         except UndefinedError:
             # a failure in a genshi expression _other_ than %{ python ... %}
             err = sys.exc_info()[1]
@@ -172,8 +174,9 @@ class CfgGenshiGenerator(CfgGenerator):
     def handle_event(self, event):
         CfgGenerator.handle_event(self, event)
         try:
-            self.template = self.loader.load(self.name, cls=NewTextTemplate,
-                                             encoding=self.encoding)
+            self.template = \
+                self.loader.load(self.name, cls=NewTextTemplate,
+                                 encoding=Bcfg2.Options.setup.encoding)
         except:
             raise PluginExecutionError("Failed to load template: %s" %
                                        sys.exc_info()[1])