diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-20 09:09:06 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-20 09:09:06 -0400 |
| commit | 5945f7f16a40066f748808c35d1db4dd0de291b6 (patch) | |
| tree | 29b3196df11b32546e425d53afea802ca524b829 /src/lib/Bcfg2/Server/Plugins/Cfg | |
| parent | 5556996cc1f8120f27adf7dcf00713398bc6f9a3 (diff) | |
| download | bcfg2-5945f7f16a40066f748808c35d1db4dd0de291b6.tar.gz bcfg2-5945f7f16a40066f748808c35d1db4dd0de291b6.tar.bz2 bcfg2-5945f7f16a40066f748808c35d1db4dd0de291b6.zip | |
cleaned up old references to BundleTemplateFile
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py | 7 |
1 files changed, 1 insertions, 6 deletions
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 |