diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-10-07 14:46:08 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-10-07 14:46:08 +0000 |
| commit | eac52c270b8b3b10e461bc46502b64c5f898bd7d (patch) | |
| tree | 96da2e78af41305b445de23596b75bf754eedbbc /src/lib/Server/Plugins/Bundler.py | |
| parent | e686d3b69600441e943c2913542e5477af528d87 (diff) | |
| download | bcfg2-eac52c270b8b3b10e461bc46502b64c5f898bd7d.tar.gz bcfg2-eac52c270b8b3b10e461bc46502b64c5f898bd7d.tar.bz2 bcfg2-eac52c270b8b3b10e461bc46502b64c5f898bd7d.zip | |
Pylint/PEP 8 Code cleanups
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5477 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Bundler.py')
| -rw-r--r-- | src/lib/Server/Plugins/Bundler.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py index ee7edb49c..914da3cee 100644 --- a/src/lib/Server/Plugins/Bundler.py +++ b/src/lib/Server/Plugins/Bundler.py @@ -1,11 +1,16 @@ '''This provides bundle clauses with translation functionality''' __revision__ = '$Revision$' -import copy, lxml.etree, Bcfg2.Server.Plugin, re +import copy +import lxml.etree +import re + +import Bcfg2.Server.Plugin try: + import genshi.template + import genshi.template.base import Bcfg2.Server.Plugins.SGenshi - import genshi.template, genshi.template.base have_genshi = True except: have_genshi = False @@ -21,11 +26,11 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Structure, Bcfg2.Server.Plugin.XMLDirectoryBacked): '''The bundler creates dependent clauses based on the bundle/translation scheme from bcfg1''' - name = 'Bundler' + name = 'Bundler' __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' patterns = re.compile('^(?P<name>.*)\.(xml|genshi)$') - + def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) Bcfg2.Server.Plugin.Structure.__init__(self) @@ -69,4 +74,3 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, self.logger.error("Got multiple matches for bundle %s" \ % (bundlename)) return bundleset - |