Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 40 insertions, 64 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
index c2e5afbad..b3781e299 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
@@ -5,63 +5,41 @@
 import re
 import sys
 import traceback
-from Bcfg2.Server.Plugin import PluginExecutionError
-from Bcfg2.Server.Plugins.Cfg import CfgGenerator, SETUP
-
-try:
-    import genshi.core
-    from genshi.template import TemplateLoader, NewTextTemplate
-    from genshi.template.eval import UndefinedError, Suite
-    #: True if Genshi libraries are available
-    HAS_GENSHI = True
-
-    def _genshi_removes_blank_lines():
-        """ Genshi 0.5 uses the Python :mod:`compiler` package to
-        compile genshi snippets to AST.  Genshi 0.6 uses some bespoke
-        magic, because compiler has been deprecated.
-        :func:`compiler.parse` produces an AST that removes all excess
-        whitespace (e.g., blank lines), while
-        :func:`genshi.template.astutil.parse` does not.  In order to
-        determine which actual line of code an error occurs on, we
-        need to know which is in use and how it treats blank lines.
-        I've beat my head against this for hours and the best/only way
-        I can find is to compile some genshi code with an error and
-        see which line it's on."""
-        code = """d = dict()
-
+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
+
+
+def _genshi_removes_blank_lines():
+    """ Genshi 0.5 uses the Python :mod:`compiler` package to
+    compile genshi snippets to AST.  Genshi 0.6 uses some bespoke
+    magic, because compiler has been deprecated.
+    :func:`compiler.parse` produces an AST that removes all excess
+    whitespace (e.g., blank lines), while
+    :func:`genshi.template.astutil.parse` does not.  In order to
+    determine which actual line of code an error occurs on, we
+    need to know which is in use and how it treats blank lines.
+    I've beat my head against this for hours and the best/only way
+    I can find is to compile some genshi code with an error and
+    see which line it's on."""
+    code = """d = dict()
 d['a']"""
-        try:
-            Suite(code).execute(dict())
-        except KeyError:
-            line = traceback.extract_tb(sys.exc_info()[2])[-1][1]
-            if line == 2:
-                return True
-            else:
-                return False
-
-    #: True if Genshi removes all blank lines from a code block before
-    #: executing it; False indicates that Genshi only removes leading
-    #: and trailing blank lines. See
-    #: :func:`_genshi_removes_blank_lines` for an explanation of this.
-    GENSHI_REMOVES_BLANK_LINES = _genshi_removes_blank_lines()
-except ImportError:
-    TemplateLoader = None  # pylint: disable=C0103
-    HAS_GENSHI = False
-
-
-def removecomment(stream):
-    """ A Genshi filter that removes comments from the stream.  This
-    function is a generator.
-
-    :param stream: The Genshi stream to remove comments from
-    :type stream: genshi.core.Stream
-    :returns: tuple of ``(kind, data, pos)``, as when iterating
-              through a Genshi stream
-    """
-    for kind, data, pos in stream:
-        if kind is genshi.core.COMMENT:
-            continue
-        yield kind, data, pos
+    try:
+        Suite(code).execute(dict())
+    except KeyError:
+        line = traceback.extract_tb(sys.exc_info()[2])[-1][1]
+        if line == 2:
+            return True
+        else:
+            return False
+
+#: True if Genshi removes all blank lines from a code block before
+#: executing it; False indicates that Genshi only removes leading
+#: and trailing blank lines. See
+#: :func:`_genshi_removes_blank_lines` for an explanation of this.
+GENSHI_REMOVES_BLANK_LINES = _genshi_removes_blank_lines()
 
 
 class CfgGenshiGenerator(CfgGenerator):
@@ -94,8 +72,6 @@ class CfgGenshiGenerator(CfgGenerator):
 
     def __init__(self, fname, spec, encoding):
         CfgGenerator.__init__(self, fname, spec, encoding)
-        if not HAS_GENSHI:
-            raise PluginExecutionError("Genshi is not available")
         self.template = None
         self.loader = self.__loader_cls__(max_cache_size=0)
     __init__.__doc__ = CfgGenerator.__init__.__doc__
@@ -106,12 +82,12 @@ class CfgGenshiGenerator(CfgGenerator):
                                        self.name)
 
         fname = entry.get('realname', entry.get('name'))
-        stream = \
-            self.template.generate(name=fname,
-                                   metadata=metadata,
-                                   path=self.name,
-                                   source_path=self.name,
-                                   repo=SETUP['repo']).filter(removecomment)
+        stream = self.template.generate(
+            name=fname,
+            metadata=metadata,
+            path=self.name,
+            source_path=self.name,
+            repo=self.setup['repo']).filter(removecomment)
         try:
             try:
                 return stream.render('text', encoding=self.encoding,