expanded pylint coverage

1 files changed, 11 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Client/XML.py b/src/lib/Bcfg2/Client/XML.py
index d6bbd3b72..720416724 100644
--- a/src/lib/Bcfg2/Client/XML.py
+++ b/src/lib/Bcfg2/Client/XML.py
@@ -2,7 +2,7 @@
 
 # library will use lxml, then builtin xml.etree, then ElementTree
 
-# pylint: disable=F0401,E0611
+# pylint: disable=F0401,E0611,W0611,W0613,C0103
 
 try:
     from lxml.etree import Element, SubElement, XML, tostring
@@ -16,8 +16,11 @@ except ImportError:
         Element = xml.etree.ElementTree.Element
         SubElement = xml.etree.ElementTree.SubElement
         XML = xml.etree.ElementTree.XML
-        def tostring(e, encoding=None, xml_declaration=None):
-            return xml.etree.ElementTree.tostring(e, encoding=encoding)
+
+        def tostring(el, encoding=None, xml_declaration=None):
+            """ tostring implementation compatible with lxml """
+            return xml.etree.ElementTree.tostring(el, encoding=encoding)
+
         driver = 'etree-py'
     except ImportError:
         try:
@@ -28,10 +31,12 @@ except ImportError:
             Element = elementtree.ElementTree.Element
             SubElement = elementtree.ElementTree.SubElement
             XML = elementtree.ElementTree.XML
-            def tostring(e, encoding=None, xml_declaration=None):
-                return elementtree.ElementTree.tostring(e)
+
+            def tostring(el, encoding=None, xml_declaration=None):
+                """ tostring implementation compatible with lxml """
+                return elementtree.ElementTree.tostring(el)
 
         except ImportError:
-            print("Failed to load lxml, xml.etree and elementtree.ElementTree")
+            print("Failed to load lxml, xml.etree or elementtree.ElementTree")
             print("Cannot continue")
             raise SystemExit(1)