diff options
| author | Roland Hedberg <roland.hedberg@adm.umu.se> | 2015-09-01 14:20:31 +0200 |
|---|---|---|
| committer | Roland Hedberg <roland.hedberg@adm.umu.se> | 2015-09-01 14:20:31 +0200 |
| commit | cc3d6828501c423f46523f651cb35278d2d71fb5 (patch) | |
| tree | 0841a6405ffb2a60a53f29b954b8fdd0247328a4 /src/saml2/metadata.py | |
| parent | 0a83d585ca4b52c43e005c905cc565dd02b0cb23 (diff) | |
| download | pysaml2-cc3d6828501c423f46523f651cb35278d2d71fb5.tar.gz | |
Fixed a python version string problem with metadata_tostring_fix().
Diffstat (limited to 'src/saml2/metadata.py')
| -rw-r--r-- | src/saml2/metadata.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py index 700508b0..170f59d3 100644 --- a/src/saml2/metadata.py +++ b/src/saml2/metadata.py @@ -55,14 +55,21 @@ ORG_ATTR_TRANSL = { } MDNS = '"urn:oasis:names:tc:SAML:2.0:metadata"' +bMDNS = b'"urn:oasis:names:tc:SAML:2.0:metadata"' XMLNSXS = " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"" - +bXMLNSXS = b" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"" def metadata_tostring_fix(desc, nspair, xmlstring=""): if not xmlstring: xmlstring = desc.to_string(nspair) - if "\"xs:string\"" in xmlstring and XMLNSXS not in xmlstring: - xmlstring = xmlstring.replace(MDNS, MDNS+XMLNSXS) + + if six.PY2: + if "\"xs:string\"" in xmlstring and XMLNSXS not in xmlstring: + xmlstring = xmlstring.replace(MDNS, MDNS+XMLNSXS) + else: + if b"\"xs:string\"" in xmlstring and bXMLNSXS not in xmlstring: + xmlstring = xmlstring.replace(bMDNS, bMDNS+bXMLNSXS) + return xmlstring |