Skip to content

Commit cc3d682

Browse files
author
Roland Hedberg
committed
Fixed a python version string problem with metadata_tostring_fix().
1 parent 0a83d58 commit cc3d682

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/saml2/metadata.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,21 @@
5555
}
5656

5757
MDNS = '"urn:oasis:names:tc:SAML:2.0:metadata"'
58+
bMDNS = b'"urn:oasis:names:tc:SAML:2.0:metadata"'
5859
XMLNSXS = " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\""
59-
60+
bXMLNSXS = b" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\""
6061

6162
def metadata_tostring_fix(desc, nspair, xmlstring=""):
6263
if not xmlstring:
6364
xmlstring = desc.to_string(nspair)
64-
if "\"xs:string\"" in xmlstring and XMLNSXS not in xmlstring:
65-
xmlstring = xmlstring.replace(MDNS, MDNS+XMLNSXS)
65+
66+
if six.PY2:
67+
if "\"xs:string\"" in xmlstring and XMLNSXS not in xmlstring:
68+
xmlstring = xmlstring.replace(MDNS, MDNS+XMLNSXS)
69+
else:
70+
if b"\"xs:string\"" in xmlstring and bXMLNSXS not in xmlstring:
71+
xmlstring = xmlstring.replace(bMDNS, bMDNS+bXMLNSXS)
72+
6673
return xmlstring
6774

6875

0 commit comments

Comments
 (0)