summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-01-22 09:18:00 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-01-22 09:18:00 -0500
commite957f89d17e431cd4210f08def2f62dfe8fcf91f (patch)
tree22b99f06030edd52110359266832bb45ad559b22 /src
parent9f16500047a7985ac1533e3dc0e1c0e3da23502f (diff)
downloadbcfg2-e957f89d17e431cd4210f08def2f62dfe8fcf91f.tar.gz
bcfg2-e957f89d17e431cd4210f08def2f62dfe8fcf91f.tar.bz2
bcfg2-e957f89d17e431cd4210f08def2f62dfe8fcf91f.zip
added missing docstring
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Client/XML.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/XML.py b/src/lib/Bcfg2/Client/XML.py
index 1f1b7df7d..561cd25a8 100644
--- a/src/lib/Bcfg2/Client/XML.py
+++ b/src/lib/Bcfg2/Client/XML.py
@@ -8,14 +8,17 @@ try:
from lxml.etree import Element, SubElement, tostring
from lxml.etree import XMLSyntaxError as ParseError
from lxml.etree import XML as _XML
+ from Bcfg2.Compat import wraps
driver = 'lxml'
+ @wraps(_XML)
def XML(val, **kwargs):
+ """ unicode strings w/encoding declaration are not supported in
+ recent lxml.etree, so we try to read XML, and if it fails we try
+ encoding the string. """
try:
return _XML(val, **kwargs)
except ValueError:
- # unicode strings w/encoding declaration are not supported
- # in recent lxml.etree
return _XML(val.encode(), **kwargs)
except ImportError:
# lxml not available