openstack/deb-python-pysaml2
Code Issues Proposed changes

Fixed a python version string problem with metadata_tostring_fix().

Browse Source
This commit is contained in:
Roland Hedberg
2015-09-01 14:20:31 +02:00
parent 0a83d585ca
commit cc3d682850
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/saml2/metadata.py
View File

@@ -55,14 +55,21 @@ ORG_ATTR_TRANSL = {
} }
MDNS = '"urn:oasis:names:tc:SAML:2.0:metadata"' 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\"" 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=""): def metadata_tostring_fix(desc, nspair, xmlstring=""):
if not xmlstring: if not xmlstring:
xmlstring = desc.to_string(nspair) 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 return xmlstring