cleaned up old references to BundleTemplateFile

3 files changed, 7 insertions, 22 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index f2464b585..83b00bcb3 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -7,11 +7,6 @@ import Bcfg2.Server.Lint
 import Bcfg2.Client.Tools.VCS
 from Bcfg2.Server.Plugins.Packages import Apt, Yum
 from Bcfg2.Client.Tools.POSIX.base import device_map
-try:
-    from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
-    HAS_GENSHI = True
-except ImportError:
-    HAS_GENSHI = False
 
 
 # format verifying functions.  TODO: These should be moved into XML
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
index a285eecd8..0521485e8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
@@ -1,6 +1,7 @@
 """ Handle encrypted Genshi templates (.crypt.genshi or .genshi.crypt
 files) """
 
+from genshi.template import TemplateLoader
 from Bcfg2.Compat import StringIO
 from Bcfg2.Server.Plugin import PluginExecutionError
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
@@ -11,12 +12,6 @@ try:
 except ImportError:
     HAS_CRYPTO = False
 
-try:
-    from genshi.template import TemplateLoader
-except ImportError:
-    # CfgGenshiGenerator will raise errors if genshi doesn't exist
-    TemplateLoader = object  # pylint: disable=C0103
-
 
 class EncryptedTemplateLoader(TemplateLoader):
     """ Subclass :class:`genshi.template.TemplateLoader` to decrypt
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
index 810b273af..59d0fa561 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
@@ -4,22 +4,17 @@ template to dynamically set additional groups for clients. """
 import os
 import lxml.etree
 import Bcfg2.Server.Plugin
-try:
-    from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
-except ImportError:
-    # BundleTemplateFile missing means that genshi is missing.  we
-    # import genshi to get the _real_ error
-    import genshi  # pylint: disable=W0611
+from Bcfg2.Server.Plugins.Bundler import BundleFile
 
 
-class GroupLogicConfig(BundleTemplateFile):
+class GroupLogicConfig(BundleFile):
     """ Representation of the GroupLogic groups.xml file """
     create = lxml.etree.Element("GroupLogic",
                                 nsmap=dict(py="http://genshi.edgewall.org/"))
 
     def __init__(self, name, fam):
-        BundleTemplateFile.__init__(self, name,
-                                    Bcfg2.Server.Plugin.Specificity(), None)
+        BundleFile.__init__(self, name,
+                            Bcfg2.Server.Plugin.Specificity(), None)
         self.fam = fam
         self.should_monitor = True
         self.fam.AddMonitor(self.name, self)
@@ -27,7 +22,7 @@ class GroupLogicConfig(BundleTemplateFile):
     def _match(self, item, metadata):
         if item.tag == 'Group' and not len(item.getchildren()):
             return [item]
-        return BundleTemplateFile._match(self, item, metadata)
+        return BundleFile._match(self, item, metadata)
 
 
 class GroupLogic(Bcfg2.Server.Plugin.Plugin,
@@ -44,4 +39,4 @@ class GroupLogic(Bcfg2.Server.Plugin.Plugin,
 
     def get_additional_groups(self, metadata):
         return [el.get("name")
-                for el in self.config.get_xml_value(metadata).findall("Group")]
+                for el in self.config.XMLMatch(metadata).findall("Group")]