jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: ElementTree string representation in python3 compatible manner

Browse source 
Use ET.tostring() to avoid implicit bytes/str conversion issues within
ET implementation. Add XML declaration separately to match previous
behavior.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2019-02-04 02:30:15 +02:00 committed by Jouni Malinen
parent 308ecbc16e
commit 69f58282bc
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/hwsim/test_ap_wps.py
View file

@ -2806,16 +2806,14 @@ def upnp_soap_action(conn, path, action, include_soap_action=True,
if neweventmac: if neweventmac:
msg = ET.SubElement(act, "NewWLANEventMAC") msg = ET.SubElement(act, "NewWLANEventMAC")
msg.text = neweventmac msg.text = neweventmac
tree = ET.ElementTree(root)
soap = StringIO()
tree.write(soap, xml_declaration=True, encoding='utf-8')
headers = { "Content-type": 'text/xml; charset="utf-8"' } headers = { "Content-type": 'text/xml; charset="utf-8"' }
if include_soap_action: if include_soap_action:
headers["SOAPAction"] = '"urn:schemas-wifialliance-org:service:WFAWLANConfig:1#%s"' % action headers["SOAPAction"] = '"urn:schemas-wifialliance-org:service:WFAWLANConfig:1#%s"' % action
elif soap_action_override: elif soap_action_override:
headers["SOAPAction"] = soap_action_override headers["SOAPAction"] = soap_action_override
conn.request("POST", path, soap.getvalue(), headers) decl = b'<?xml version=\'1.0\' encoding=\'utf8\'?>\n'
conn.request("POST", path, decl + ET.tostring(root), headers)
return conn.getresponse() return conn.getresponse()
def test_ap_wps_upnp(dev, apdev): def test_ap_wps_upnp(dev, apdev):