diff options
author | Ganesh Nalawade <ganesh634@gmail.com> | 2018-04-04 14:05:44 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 14:05:44 +0530 |
commit | 63bf0eaf2bc80a4484f3fe1ba34bd9eb7cc16eff (patch) | |
tree | ed1bdd9d0653ee59476396d4f658efbb0d4e22f5 | |
parent | efb8eb6e2a65970e5064ee4921a87d18f06bff35 (diff) | |
download | ansible-temp-staging-post-2.4.4.tar.gz |
Encode xml data to utf8 standard (#34079) (#38259)temp-staging-post-2.4.4
(cherry picked from commit 5089122a323027bab30c11e5e0888aee8644a5d7)
-rw-r--r-- | lib/ansible/modules/network/dellos10/dellos10_facts.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ansible/modules/network/dellos10/dellos10_facts.py b/lib/ansible/modules/network/dellos10/dellos10_facts.py index 33bad05ba2..9e763a4825 100644 --- a/lib/ansible/modules/network/dellos10/dellos10_facts.py +++ b/lib/ansible/modules/network/dellos10/dellos10_facts.py @@ -160,7 +160,7 @@ class Default(FactsBase): def populate(self): super(Default, self).populate() data = self.responses[0] - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.facts['name'] = self.parse_name(xml_data) self.facts['version'] = self.parse_version(xml_data) @@ -168,7 +168,7 @@ class Default(FactsBase): self.facts['hostname'] = self.parse_hostname(xml_data) data = self.responses[1] - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.facts['servicetag'] = self.parse_servicetag(xml_data) @@ -220,7 +220,7 @@ class Hardware(FactsBase): super(Hardware, self).populate() data = self.responses[0] - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.facts['cpu_arch'] = self.parse_cpu_arch(xml_data) @@ -277,7 +277,7 @@ class Interfaces(FactsBase): for line in int_show_data: if pattern in line: if skip is False: - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.populate_interfaces(xml_data) data = '' else: @@ -286,7 +286,7 @@ class Interfaces(FactsBase): data += line if skip is False: - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.populate_interfaces(xml_data) self.facts['interfaces'] = self.intf_facts @@ -299,7 +299,7 @@ class Interfaces(FactsBase): for line in lldp_data: if pattern in line: if skip is False: - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.populate_neighbors(xml_data) data = '' else: @@ -308,7 +308,7 @@ class Interfaces(FactsBase): data += line if skip is False: - xml_data = ET.fromstring(data) + xml_data = ET.fromstring(data.encode('utf8')) self.populate_neighbors(xml_data) self.facts['neighbors'] = self.lldp_facts |