python3 compat: python3 strings have no decode()

2017-10-11 12:35:58 +01:00 · 2017-10-11 12:35:58 +01:00 · 5146d66126
parent 4d9c6141dd
commit 5146d66126
1 changed files with 5 additions and 1 deletions
--- a/virtinst/xmlbuilder.py
+++ b/virtinst/xmlbuilder.py
@ -829,7 +829,11 @@ class XMLBuilder(object):
        self.conn = conn

        if self._XML_SANITIZE:
-            parsexml = parsexml.decode('ascii', 'ignore').encode('ascii')
+            if hasattr(parsexml, 'decode'):
+                parsexml = parsexml.decode("ascii", "ignore").encode("ascii")
+            else:
+                parsexml = parsexml.encode("ascii", "ignore").decode("ascii")
+
            parsexml = "".join([c for c in parsexml if c in string.printable])

        self._propstore = {}