text formating

1 files changed, 665 insertions, 634 deletions

diff --git a/src/saml2/md.py b/src/saml2/md.py
index 70c0707c..81b2ef24 100644
--- a/src/saml2/md.py
+++ b/src/saml2/md.py
@@ -13,6 +13,7 @@ from saml2 import saml
 
 NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:metadata'
 
+
 class EntityIDType_(SamlBase):
     """The urn:oasis:names:tc:SAML:2.0:metadata:entityIDType element """
 
@@ -24,6 +25,7 @@ class EntityIDType_(SamlBase):
     c_child_order = SamlBase.c_child_order[:]
     c_cardinality = SamlBase.c_cardinality.copy()
 
+
 def entity_id_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(EntityIDType_, xml_string)
 
@@ -43,17 +45,16 @@ class LocalizedNameType_(SamlBase):
                                                                   True)
 
     def __init__(self,
-            lang=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.lang=lang
+                 lang=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes)
+        self.lang = lang
+
 
 def localized_name_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(LocalizedNameType_, xml_string)
@@ -74,17 +75,15 @@ class LocalizedURIType_(SamlBase):
                                                                   True)
 
     def __init__(self,
-            lang=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.lang=lang
+                 lang=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes)
+        self.lang = lang
 
 
 def localized_uri_type__from_string(xml_string):
@@ -120,21 +119,19 @@ class EndpointType_(SamlBase):
     c_attributes['ResponseLocation'] = ('response_location', 'anyURI', False)
 
     def __init__(self,
-            binding=None,
-            location=None,
-            response_location=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.binding=binding
-        self.location=location
-        self.response_location=response_location
+                 binding=None,
+                 location=None,
+                 response_location=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes)
+        self.binding = binding
+        self.location = location
+        self.response_location = response_location
 
 
 def endpoint_type__from_string(xml_string):
@@ -154,25 +151,23 @@ class IndexedEndpointType_(EndpointType_):
     c_attributes['isDefault'] = ('is_default', 'boolean', False)
 
     def __init__(self,
-            index=None,
-            is_default=None,
-            binding=None,
-            location=None,
-            response_location=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        EndpointType_.__init__(self, 
-                binding=binding,
-                location=location,
-                response_location=response_location,
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.index=index
-        self.is_default=is_default
+                 index=None,
+                 is_default=None,
+                 binding=None,
+                 location=None,
+                 response_location=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None):
+        EndpointType_.__init__(self,
+                               binding=binding,
+                               location=location,
+                               response_location=response_location,
+                               text=text,
+                               extension_elements=extension_elements,
+                               extension_attributes=extension_attributes)
+        self.index = index
+        self.is_default = is_default
 
 
 def indexed_endpoint_type__from_string(xml_string):
@@ -342,7 +337,7 @@ class AdditionalMetadataLocationType_(SamlBase):
         SamlBase.__init__(self, text=text,
                           extension_elements=extension_elements,
                           extension_attributes=extension_attributes)
-        self.namespace=namespace
+        self.namespace = namespace
 
 
 def additional_metadata_location_type__from_string(xml_string):
@@ -591,7 +586,7 @@ class RequestedAttributeType_(saml.AttributeType_):
                                      text=text,
                                      extension_elements=extension_elements,
                                      extension_attributes=extension_attributes)
-        self.is_required=is_required
+        self.is_required = is_required
 
 
 def requested_attribute_type__from_string(xml_string):
@@ -685,17 +680,17 @@ class OrganizationType_(SamlBase):
     c_cardinality = SamlBase.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = (
         'extensions', Extensions)
-    c_cardinality['extensions'] = {"min":0, "max":1}
+    c_cardinality['extensions'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationName'] = (
         'organization_name', [OrganizationName])
-    c_cardinality['organization_name'] = {"min":1}
+    c_cardinality['organization_name'] = {"min": 1}
     c_children[
         '{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationDisplayName'] = (
             'organization_display_name', [OrganizationDisplayName])
-    c_cardinality['organization_display_name'] = {"min":1}
+    c_cardinality['organization_display_name'] = {"min": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationURL'] = (
         'organization_url', [OrganizationURL])
-    c_cardinality['organization_url'] = {"min":1}
+    c_cardinality['organization_url'] = {"min": 1}
     c_child_order.extend(['extensions', 'organization_name',
                           'organization_display_name', 'organization_url'])
 
@@ -705,10 +700,10 @@ class OrganizationType_(SamlBase):
         SamlBase.__init__(self, text=text,
                           extension_elements=extension_elements,
                           extension_attributes=extension_attributes)
-        self.extensions=extensions
-        self.organization_name=organization_name or []
-        self.organization_display_name=organization_display_name or []
-        self.organization_url=organization_url or []
+        self.extensions = extensions
+        self.organization_name = organization_name or []
+        self.organization_display_name = organization_display_name or []
+        self.organization_url = organization_url or []
 
 
 def organization_type__from_string(xml_string):
@@ -726,50 +721,50 @@ class ContactType_(SamlBase):
     c_cardinality = SamlBase.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = (
         'extensions', Extensions)
-    c_cardinality['extensions'] = {"min":0, "max":1}
+    c_cardinality['extensions'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Company'] = (
         'company', Company)
-    c_cardinality['company'] = {"min":0, "max":1}
+    c_cardinality['company'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}GivenName'] = (
         'given_name', GivenName)
-    c_cardinality['given_name'] = {"min":0, "max":1}
+    c_cardinality['given_name'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}SurName'] = (
         'sur_name', SurName)
-    c_cardinality['sur_name'] = {"min":0, "max":1}
+    c_cardinality['sur_name'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}EmailAddress'] = (
         'email_address', [EmailAddress])
-    c_cardinality['email_address'] = {"min":0}
+    c_cardinality['email_address'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}TelephoneNumber'] = (
         'telephone_number', [TelephoneNumber])
-    c_cardinality['telephone_number'] = {"min":0}
+    c_cardinality['telephone_number'] = {"min": 0}
     c_attributes['contactType'] = ('contact_type', ContactTypeType_, True)
     c_child_order.extend(['extensions', 'company', 'given_name', 'sur_name',
                           'email_address', 'telephone_number'])
 
     def __init__(self,
-            extensions=None,
-            company=None,
-            given_name=None,
-            sur_name=None,
-            email_address=None,
-            telephone_number=None,
-            contact_type=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.extensions=extensions
-        self.company=company
-        self.given_name=given_name
-        self.sur_name=sur_name
-        self.email_address=email_address or []
-        self.telephone_number=telephone_number or []
-        self.contact_type=contact_type
+                 extensions=None,
+                 company=None,
+                 given_name=None,
+                 sur_name=None,
+                 email_address=None,
+                 telephone_number=None,
+                 contact_type=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes,
+        )
+        self.extensions = extensions
+        self.company = company
+        self.given_name = given_name
+        self.sur_name = sur_name
+        self.email_address = email_address or []
+        self.telephone_number = telephone_number or []
+        self.contact_type = contact_type
 
 
 def contact_type__from_string(xml_string):
@@ -811,21 +806,20 @@ class KeyDescriptorType_(SamlBase):
     c_child_order.extend(['key_info', 'encryption_method'])
 
     def __init__(self,
-            key_info=None,
-            encryption_method=None,
-            use=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.key_info=key_info
-        self.encryption_method=encryption_method or []
-        self.use=use
+                 key_info=None,
+                 encryption_method=None,
+                 use=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes)
+        self.key_info = key_info
+        self.encryption_method = encryption_method or []
+        self.use = use
+
 
 def key_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(KeyDescriptorType_, xml_string)
@@ -841,6 +835,7 @@ class RequestedAttribute(RequestedAttributeType_):
     c_child_order = RequestedAttributeType_.c_child_order[:]
     c_cardinality = RequestedAttributeType_.c_cardinality.copy()
 
+
 def requested_attribute_from_string(xml_string):
     return saml2.create_class_from_xml_string(RequestedAttribute, xml_string)
 
@@ -855,6 +850,7 @@ class Organization(OrganizationType_):
     c_child_order = OrganizationType_.c_child_order[:]
     c_cardinality = OrganizationType_.c_cardinality.copy()
 
+
 def organization_from_string(xml_string):
     return saml2.create_class_from_xml_string(Organization, xml_string)
 
@@ -869,6 +865,7 @@ class ContactPerson(ContactType_):
     c_child_order = ContactType_.c_child_order[:]
     c_cardinality = ContactType_.c_cardinality.copy()
 
+
 def contact_person_from_string(xml_string):
     return saml2.create_class_from_xml_string(ContactPerson, xml_string)
 
@@ -883,6 +880,7 @@ class KeyDescriptor(KeyDescriptorType_):
     c_child_order = KeyDescriptorType_.c_child_order[:]
     c_cardinality = KeyDescriptorType_.c_cardinality.copy()
 
+
 def key_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(KeyDescriptor, xml_string)
 
@@ -896,24 +894,21 @@ class RoleDescriptorType_(SamlBase):
     c_attributes = SamlBase.c_attributes.copy()
     c_child_order = SamlBase.c_child_order[:]
     c_cardinality = SamlBase.c_cardinality.copy()
-    c_children['{http://www.w3.org/2000/09/xmldsig#}Signature'] = ('signature',
-                                                                   ds.Signature)
-    c_cardinality['signature'] = {"min":0, "max":1}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = ('extensions',
-                                                                      Extensions)
-    c_cardinality['extensions'] = {"min":0, "max":1}
+    c_children['{http://www.w3.org/2000/09/xmldsig#}Signature'] = (
+        'signature', ds.Signature)
+    c_cardinality['signature'] = {"min": 0, "max": 1}
+    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = (
+        'extensions', Extensions)
+    c_cardinality['extensions'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor'] = (
-                                                            'key_descriptor',
-                                                            [KeyDescriptor])
-    c_cardinality['key_descriptor'] = {"min":0}
+        'key_descriptor', [KeyDescriptor])
+    c_cardinality['key_descriptor'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Organization'] = (
-                                                            'organization',
-                                                            Organization)
-    c_cardinality['organization'] = {"min":0, "max":1}
+        'organization', Organization)
+    c_cardinality['organization'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson'] = (
-                                                            'contact_person',
-                                                            [ContactPerson])
-    c_cardinality['contact_person'] = {"min":0}
+        'contact_person', [ContactPerson])
+    c_cardinality['contact_person'] = {"min": 0}
     c_attributes['ID'] = ('id', 'ID', False)
     c_attributes['validUntil'] = ('valid_until', 'dateTime', False)
     c_attributes['cacheDuration'] = ('cache_duration', 'duration', False)
@@ -924,35 +919,33 @@ class RoleDescriptorType_(SamlBase):
                           'organization', 'contact_person'])
 
     def __init__(self,
-            signature=None,
-            extensions=None,
-            key_descriptor=None,
-            organization=None,
-            contact_person=None,
-            id=None,
-            valid_until=None,
-            cache_duration=None,
-            protocol_support_enumeration=None,
-            error_url=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.signature=signature
-        self.extensions=extensions
-        self.key_descriptor=key_descriptor or []
-        self.organization=organization
-        self.contact_person=contact_person or []
-        self.id=id
-        self.valid_until=valid_until
-        self.cache_duration=cache_duration
-        self.protocol_support_enumeration=protocol_support_enumeration
-        self.error_url=error_url
+                 signature=None,
+                 extensions=None,
+                 key_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 protocol_support_enumeration=None,
+                 error_url=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes)
+        self.signature = signature
+        self.extensions = extensions
+        self.key_descriptor = key_descriptor or []
+        self.organization = organization
+        self.contact_person = contact_person or []
+        self.id = id
+        self.valid_until = valid_until
+        self.cache_duration = cache_duration
+        self.protocol_support_enumeration = protocol_support_enumeration
+        self.error_url = error_url
 
 
 class SSODescriptorType_(RoleDescriptorType_):
@@ -964,22 +957,19 @@ class SSODescriptorType_(RoleDescriptorType_):
     c_attributes = RoleDescriptorType_.c_attributes.copy()
     c_child_order = RoleDescriptorType_.c_child_order[:]
     c_cardinality = RoleDescriptorType_.c_cardinality.copy()
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}ArtifactResolutionService'] = (
-                                                'artifact_resolution_service',
-                                                [ArtifactResolutionService])
-    c_cardinality['artifact_resolution_service'] = {"min":0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}ArtifactResolutionService'] = (
+            'artifact_resolution_service', [ArtifactResolutionService])
+    c_cardinality['artifact_resolution_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}SingleLogoutService'] = (
-                                                'single_logout_service',
-                                                [SingleLogoutService])
-    c_cardinality['single_logout_service'] = {"min":0}
+        'single_logout_service', [SingleLogoutService])
+    c_cardinality['single_logout_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}ManageNameIDService'] = (
-                                                'manage_name_id_service',
-                                                [ManageNameIDService])
-    c_cardinality['manage_name_id_service'] = {"min":0}
+        'manage_name_id_service', [ManageNameIDService])
+    c_cardinality['manage_name_id_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat'] = (
-                                                'name_id_format',
-                                                [NameIDFormat])
-    c_cardinality['name_id_format'] = {"min":0}
+        'name_id_format', [NameIDFormat])
+    c_cardinality['name_id_format'] = {"min": 0}
     c_child_order.extend(['artifact_resolution_service',
                           'single_logout_service', 'manage_name_id_service',
                           'name_id_format'])
@@ -1002,8 +992,7 @@ class SSODescriptorType_(RoleDescriptorType_):
             error_url=None,
             text=None,
             extension_elements=None,
-            extension_attributes=None,
-        ):
+            extension_attributes=None):
         RoleDescriptorType_.__init__(
             self,
             signature=signature,
@@ -1018,12 +1007,11 @@ class SSODescriptorType_(RoleDescriptorType_):
             error_url=error_url,
             text=text,
             extension_elements=extension_elements,
-            extension_attributes=extension_attributes,
-        )
-        self.artifact_resolution_service=artifact_resolution_service or []
-        self.single_logout_service=single_logout_service or []
-        self.manage_name_id_service=manage_name_id_service or []
-        self.name_id_format=name_id_format or []
+            extension_attributes=extension_attributes)
+        self.artifact_resolution_service = artifact_resolution_service or []
+        self.single_logout_service = single_logout_service or []
+        self.manage_name_id_service = manage_name_id_service or []
+        self.name_id_format = name_id_format or []
 
 
 class IDPSSODescriptorType_(SSODescriptorType_):
@@ -1036,25 +1024,21 @@ class IDPSSODescriptorType_(SSODescriptorType_):
     c_child_order = SSODescriptorType_.c_child_order[:]
     c_cardinality = SSODescriptorType_.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService'] = (
-                                                    'single_sign_on_service',
-                                                    [SingleSignOnService])
-    c_cardinality['single_sign_on_service'] = {"min":1}
+        'single_sign_on_service', [SingleSignOnService])
+    c_cardinality['single_sign_on_service'] = {"min": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}NameIDMappingService'] = (
-                                                    'name_id_mapping_service',
-                                                    [NameIDMappingService])
-    c_cardinality['name_id_mapping_service'] = {"min":0}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
-                                                'assertion_id_request_service',
-                                                [AssertionIDRequestService])
-    c_cardinality['assertion_id_request_service'] = {"min":0}
+        'name_id_mapping_service', [NameIDMappingService])
+    c_cardinality['name_id_mapping_service'] = {"min": 0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
+            'assertion_id_request_service', [AssertionIDRequestService])
+    c_cardinality['assertion_id_request_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile'] = (
-                                                    'attribute_profile',
-                                                    [AttributeProfile])
-    c_cardinality['attribute_profile'] = {"min":0}
+        'attribute_profile', [AttributeProfile])
+    c_cardinality['attribute_profile'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:assertion}Attribute'] = (
-                                                    'attribute',
-                                                    [saml.Attribute])
-    c_cardinality['attribute'] = {"min":0}
+        'attribute', [saml.Attribute])
+    c_cardinality['attribute'] = {"min": 0}
     c_attributes['WantAuthnRequestsSigned'] = ('want_authn_requests_signed',
                                                'boolean', False)
     c_child_order.extend(['single_sign_on_service', 'name_id_mapping_service',
@@ -1062,62 +1046,64 @@ class IDPSSODescriptorType_(SSODescriptorType_):
                           'attribute'])
 
     def __init__(self,
-            single_sign_on_service=None,
-            name_id_mapping_service=None,
-            assertion_id_request_service=None,
-            attribute_profile=None,
-            attribute=None,
-            want_authn_requests_signed=None,
-            artifact_resolution_service=None,
-            single_logout_service=None,
-            manage_name_id_service=None,
-            name_id_format=None,
-            signature=None,
-            extensions=None,
-            key_descriptor=None,
-            organization=None,
-            contact_person=None,
-            id=None,
-            valid_until=None,
-            cache_duration=None,
-            protocol_support_enumeration=None,
-            error_url=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SSODescriptorType_.__init__(self, 
-                artifact_resolution_service=artifact_resolution_service,
-                single_logout_service=single_logout_service,
-                manage_name_id_service=manage_name_id_service,
-                name_id_format=name_id_format,
-                signature=signature,
-                extensions=extensions,
-                key_descriptor=key_descriptor,
-                organization=organization,
-                contact_person=contact_person,
-                id=id,
-                valid_until=valid_until,
-                cache_duration=cache_duration,
-                protocol_support_enumeration=protocol_support_enumeration,
-                error_url=error_url,
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.single_sign_on_service=single_sign_on_service or []
-        self.name_id_mapping_service=name_id_mapping_service or []
-        self.assertion_id_request_service=assertion_id_request_service or []
-        self.attribute_profile=attribute_profile or []
-        self.attribute=attribute or []
-        self.want_authn_requests_signed=want_authn_requests_signed
+                 single_sign_on_service=None,
+                 name_id_mapping_service=None,
+                 assertion_id_request_service=None,
+                 attribute_profile=None,
+                 attribute=None,
+                 want_authn_requests_signed=None,
+                 artifact_resolution_service=None,
+                 single_logout_service=None,
+                 manage_name_id_service=None,
+                 name_id_format=None,
+                 signature=None,
+                 extensions=None,
+                 key_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 protocol_support_enumeration=None,
+                 error_url=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SSODescriptorType_.__init__(self,
+                                    artifact_resolution_service=artifact_resolution_service,
+                                    single_logout_service=single_logout_service,
+                                    manage_name_id_service=manage_name_id_service,
+                                    name_id_format=name_id_format,
+                                    signature=signature,
+                                    extensions=extensions,
+                                    key_descriptor=key_descriptor,
+                                    organization=organization,
+                                    contact_person=contact_person,
+                                    id=id,
+                                    valid_until=valid_until,
+                                    cache_duration=cache_duration,
+                                    protocol_support_enumeration=protocol_support_enumeration,
+                                    error_url=error_url,
+                                    text=text,
+                                    extension_elements=extension_elements,
+                                    extension_attributes=extension_attributes,
+        )
+        self.single_sign_on_service = single_sign_on_service or []
+        self.name_id_mapping_service = name_id_mapping_service or []
+        self.assertion_id_request_service = assertion_id_request_service or []
+        self.attribute_profile = attribute_profile or []
+        self.attribute = attribute or []
+        self.want_authn_requests_signed = want_authn_requests_signed
+
 
 def idpsso_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(IDPSSODescriptorType_, xml_string)
 
 
 class AttributeConsumingServiceType_(SamlBase):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeConsumingServiceType element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeConsumingServiceType
+    element """
 
     c_tag = 'AttributeConsumingServiceType'
     c_namespace = NAMESPACE
@@ -1126,42 +1112,43 @@ class AttributeConsumingServiceType_(SamlBase):
     c_child_order = SamlBase.c_child_order[:]
     c_cardinality = SamlBase.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}ServiceName'] = (
-                                                            'service_name',
-                                                            [ServiceName])
-    c_cardinality['service_name'] = {"min":1}
+        'service_name',
+        [ServiceName])
+    c_cardinality['service_name'] = {"min": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}ServiceDescription'] = (
-                                                        'service_description',
-                                                        [ServiceDescription])
-    c_cardinality['service_description'] = {"min":0}
+        'service_description',
+        [ServiceDescription])
+    c_cardinality['service_description'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttribute'] = (
-                                                        'requested_attribute',
-                                                        [RequestedAttribute])
-    c_cardinality['requested_attribute'] = {"min":1}
+        'requested_attribute',
+        [RequestedAttribute])
+    c_cardinality['requested_attribute'] = {"min": 1}
     c_attributes['index'] = ('index', 'unsignedShort', True)
     c_attributes['isDefault'] = ('is_default', 'boolean', False)
     c_child_order.extend(['service_name', 'service_description',
                           'requested_attribute'])
 
     def __init__(self,
-            service_name=None,
-            service_description=None,
-            requested_attribute=None,
-            index=None,
-            is_default=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.service_name=service_name or []
-        self.service_description=service_description or []
-        self.requested_attribute=requested_attribute or []
-        self.index=index
-        self.is_default=is_default
+                 service_name=None,
+                 service_description=None,
+                 requested_attribute=None,
+                 index=None,
+                 is_default=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes,
+        )
+        self.service_name = service_name or []
+        self.service_description = service_description or []
+        self.requested_attribute = requested_attribute or []
+        self.index = index
+        self.is_default = is_default
+
 
 def attribute_consuming_service_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(AttributeConsumingServiceType_,
@@ -1169,7 +1156,8 @@ def attribute_consuming_service_type__from_string(xml_string):
 
 
 class AuthnAuthorityDescriptorType_(RoleDescriptorType_):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AuthnAuthorityDescriptorType element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AuthnAuthorityDescriptorType
+    element """
 
     c_tag = 'AuthnAuthorityDescriptorType'
     c_namespace = NAMESPACE
@@ -1178,56 +1166,58 @@ class AuthnAuthorityDescriptorType_(RoleDescriptorType_):
     c_child_order = RoleDescriptorType_.c_child_order[:]
     c_cardinality = RoleDescriptorType_.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AuthnQueryService'] = (
-                                                    'authn_query_service',
-                                                    [AuthnQueryService])
-    c_cardinality['authn_query_service'] = {"min":1}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
-                                                'assertion_id_request_service',
-                                                [AssertionIDRequestService])
-    c_cardinality['assertion_id_request_service'] = {"min":0}
+        'authn_query_service',
+        [AuthnQueryService])
+    c_cardinality['authn_query_service'] = {"min": 1}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
+        'assertion_id_request_service',
+        [AssertionIDRequestService])
+    c_cardinality['assertion_id_request_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat'] = (
-                                                    'name_id_format',
-                                                    [NameIDFormat])
-    c_cardinality['name_id_format'] = {"min":0}
+        'name_id_format',
+        [NameIDFormat])
+    c_cardinality['name_id_format'] = {"min": 0}
     c_child_order.extend(['authn_query_service', 'assertion_id_request_service',
                           'name_id_format'])
 
     def __init__(self,
-            authn_query_service=None,
-            assertion_id_request_service=None,
-            name_id_format=None,
-            signature=None,
-            extensions=None,
-            key_descriptor=None,
-            organization=None,
-            contact_person=None,
-            id=None,
-            valid_until=None,
-            cache_duration=None,
-            protocol_support_enumeration=None,
-            error_url=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        RoleDescriptorType_.__init__(self, 
-                signature=signature,
-                extensions=extensions,
-                key_descriptor=key_descriptor,
-                organization=organization,
-                contact_person=contact_person,
-                id=id,
-                valid_until=valid_until,
-                cache_duration=cache_duration,
-                protocol_support_enumeration=protocol_support_enumeration,
-                error_url=error_url,
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.authn_query_service=authn_query_service or []
-        self.assertion_id_request_service=assertion_id_request_service or []
-        self.name_id_format=name_id_format or []
+                 authn_query_service=None,
+                 assertion_id_request_service=None,
+                 name_id_format=None,
+                 signature=None,
+                 extensions=None,
+                 key_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 protocol_support_enumeration=None,
+                 error_url=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        RoleDescriptorType_.__init__(self,
+                                     signature=signature,
+                                     extensions=extensions,
+                                     key_descriptor=key_descriptor,
+                                     organization=organization,
+                                     contact_person=contact_person,
+                                     id=id,
+                                     valid_until=valid_until,
+                                     cache_duration=cache_duration,
+                                     protocol_support_enumeration=protocol_support_enumeration,
+                                     error_url=error_url,
+                                     text=text,
+                                     extension_elements=extension_elements,
+                                     extension_attributes=extension_attributes,
+        )
+        self.authn_query_service = authn_query_service or []
+        self.assertion_id_request_service = assertion_id_request_service or []
+        self.name_id_format = name_id_format or []
+
 
 def authn_authority_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(AuthnAuthorityDescriptorType_,
@@ -1244,63 +1234,66 @@ class PDPDescriptorType_(RoleDescriptorType_):
     c_child_order = RoleDescriptorType_.c_child_order[:]
     c_cardinality = RoleDescriptorType_.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AuthzService'] = (
-                                                            'authz_service',
-                                                            [AuthzService])
-    c_cardinality['authz_service'] = {"min":1}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
-                                            'assertion_id_request_service',
-                                            [AssertionIDRequestService])
-    c_cardinality['assertion_id_request_service'] = {"min":0}
+        'authz_service',
+        [AuthzService])
+    c_cardinality['authz_service'] = {"min": 1}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
+        'assertion_id_request_service',
+        [AssertionIDRequestService])
+    c_cardinality['assertion_id_request_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat'] = (
-                                                            'name_id_format',
-                                                            [NameIDFormat])
-    c_cardinality['name_id_format'] = {"min":0}
+        'name_id_format',
+        [NameIDFormat])
+    c_cardinality['name_id_format'] = {"min": 0}
     c_child_order.extend(['authz_service', 'assertion_id_request_service',
                           'name_id_format'])
 
     def __init__(self,
-            authz_service=None,
-            assertion_id_request_service=None,
-            name_id_format=None,
-            signature=None,
-            extensions=None,
-            key_descriptor=None,
-            organization=None,
-            contact_person=None,
-            id=None,
-            valid_until=None,
-            cache_duration=None,
-            protocol_support_enumeration=None,
-            error_url=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        RoleDescriptorType_.__init__(self, 
-                signature=signature,
-                extensions=extensions,
-                key_descriptor=key_descriptor,
-                organization=organization,
-                contact_person=contact_person,
-                id=id,
-                valid_until=valid_until,
-                cache_duration=cache_duration,
-                protocol_support_enumeration=protocol_support_enumeration,
-                error_url=error_url,
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.authz_service=authz_service or []
-        self.assertion_id_request_service=assertion_id_request_service or []
-        self.name_id_format=name_id_format or []
+                 authz_service=None,
+                 assertion_id_request_service=None,
+                 name_id_format=None,
+                 signature=None,
+                 extensions=None,
+                 key_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 protocol_support_enumeration=None,
+                 error_url=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        RoleDescriptorType_.__init__(self,
+                                     signature=signature,
+                                     extensions=extensions,
+                                     key_descriptor=key_descriptor,
+                                     organization=organization,
+                                     contact_person=contact_person,
+                                     id=id,
+                                     valid_until=valid_until,
+                                     cache_duration=cache_duration,
+                                     protocol_support_enumeration=protocol_support_enumeration,
+                                     error_url=error_url,
+                                     text=text,
+                                     extension_elements=extension_elements,
+                                     extension_attributes=extension_attributes,
+        )
+        self.authz_service = authz_service or []
+        self.assertion_id_request_service = assertion_id_request_service or []
+        self.name_id_format = name_id_format or []
+
 
 def pdp_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(PDPDescriptorType_, xml_string)
 
 
 class AttributeAuthorityDescriptorType_(RoleDescriptorType_):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeAuthorityDescriptorType element """
+    """The urn:oasis:names:tc:SAML:2
+    .0:metadata:AttributeAuthorityDescriptorType element """
 
     c_tag = 'AttributeAuthorityDescriptorType'
     c_namespace = NAMESPACE
@@ -1309,68 +1302,70 @@ class AttributeAuthorityDescriptorType_(RoleDescriptorType_):
     c_child_order = RoleDescriptorType_.c_child_order[:]
     c_cardinality = RoleDescriptorType_.c_cardinality.copy()
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AttributeService'] = (
-                                                        'attribute_service',
-                                                        [AttributeService])
-    c_cardinality['attribute_service'] = {"min":1}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
-                                            'assertion_id_request_service',
-                                            [AssertionIDRequestService])
-    c_cardinality['assertion_id_request_service'] = {"min":0}
+        'attribute_service',
+        [AttributeService])
+    c_cardinality['attribute_service'] = {"min": 1}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService'] = (
+        'assertion_id_request_service',
+        [AssertionIDRequestService])
+    c_cardinality['assertion_id_request_service'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat'] = (
-                                                        'name_id_format',
-                                                        [NameIDFormat])
-    c_cardinality['name_id_format'] = {"min":0}
+        'name_id_format',
+        [NameIDFormat])
+    c_cardinality['name_id_format'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile'] = (
-                                                        'attribute_profile',
-                                                        [AttributeProfile])
-    c_cardinality['attribute_profile'] = {"min":0}
+        'attribute_profile',
+        [AttributeProfile])
+    c_cardinality['attribute_profile'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:assertion}Attribute'] = (
-                                                        'attribute',
-                                                        [saml.Attribute])
-    c_cardinality['attribute'] = {"min":0}
+        'attribute',
+        [saml.Attribute])
+    c_cardinality['attribute'] = {"min": 0}
     c_child_order.extend(['attribute_service', 'assertion_id_request_service',
                           'name_id_format', 'attribute_profile', 'attribute'])
 
     def __init__(self,
-            attribute_service=None,
-            assertion_id_request_service=None,
-            name_id_format=None,
-            attribute_profile=None,
-            attribute=None,
-            signature=None,
-            extensions=None,
-            key_descriptor=None,
-            organization=None,
-            contact_person=None,
-            id=None,
-            valid_until=None,
-            cache_duration=None,
-            protocol_support_enumeration=None,
-            error_url=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        RoleDescriptorType_.__init__(self, 
-                signature=signature,
-                extensions=extensions,
-                key_descriptor=key_descriptor,
-                organization=organization,
-                contact_person=contact_person,
-                id=id,
-                valid_until=valid_until,
-                cache_duration=cache_duration,
-                protocol_support_enumeration=protocol_support_enumeration,
-                error_url=error_url,
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.attribute_service=attribute_service or []
-        self.assertion_id_request_service=assertion_id_request_service or []
-        self.name_id_format=name_id_format or []
-        self.attribute_profile=attribute_profile or []
-        self.attribute=attribute or []
+                 attribute_service=None,
+                 assertion_id_request_service=None,
+                 name_id_format=None,
+                 attribute_profile=None,
+                 attribute=None,
+                 signature=None,
+                 extensions=None,
+                 key_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 protocol_support_enumeration=None,
+                 error_url=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        RoleDescriptorType_.__init__(self,
+                                     signature=signature,
+                                     extensions=extensions,
+                                     key_descriptor=key_descriptor,
+                                     organization=organization,
+                                     contact_person=contact_person,
+                                     id=id,
+                                     valid_until=valid_until,
+                                     cache_duration=cache_duration,
+                                     protocol_support_enumeration=protocol_support_enumeration,
+                                     error_url=error_url,
+                                     text=text,
+                                     extension_elements=extension_elements,
+                                     extension_attributes=extension_attributes,
+        )
+        self.attribute_service = attribute_service or []
+        self.assertion_id_request_service = assertion_id_request_service or []
+        self.name_id_format = name_id_format or []
+        self.attribute_profile = attribute_profile or []
+        self.attribute = attribute or []
+
 
 def attribute_authority_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(AttributeAuthorityDescriptorType_,
@@ -1378,7 +1373,8 @@ def attribute_authority_descriptor_type__from_string(xml_string):
 
 
 class AffiliationDescriptorType_(SamlBase):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AffiliationDescriptorType element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AffiliationDescriptorType
+    element """
 
     c_tag = 'AffiliationDescriptorType'
     c_namespace = NAMESPACE
@@ -1388,19 +1384,19 @@ class AffiliationDescriptorType_(SamlBase):
     c_cardinality = SamlBase.c_cardinality.copy()
     c_children['{http://www.w3.org/2000/09/xmldsig#}Signature'] = ('signature',
                                                                    ds.Signature)
-    c_cardinality['signature'] = {"min":0, "max":1}
+    c_cardinality['signature'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = (
-                                                            'extensions',
-                                                            Extensions)
-    c_cardinality['extensions'] = {"min":0, "max":1}
+        'extensions',
+        Extensions)
+    c_cardinality['extensions'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AffiliateMember'] = (
-                                                            'affiliate_member',
-                                                            [AffiliateMember])
-    c_cardinality['affiliate_member'] = {"min":1}
+        'affiliate_member',
+        [AffiliateMember])
+    c_cardinality['affiliate_member'] = {"min": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor'] = (
-                                                            'key_descriptor',
-                                                            [KeyDescriptor])
-    c_cardinality['key_descriptor'] = {"min":0}
+        'key_descriptor',
+        [KeyDescriptor])
+    c_cardinality['key_descriptor'] = {"min": 0}
     c_attributes['affiliationOwnerID'] = ('affiliation_owner_id', EntityIDType_,
                                           True)
     c_attributes['validUntil'] = ('valid_until', 'dateTime', False)
@@ -1410,31 +1406,32 @@ class AffiliationDescriptorType_(SamlBase):
                           'key_descriptor'])
 
     def __init__(self,
-            signature=None,
-            extensions=None,
-            affiliate_member=None,
-            key_descriptor=None,
-            affiliation_owner_id=None,
-            valid_until=None,
-            cache_duration=None,
-            id=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.signature=signature
-        self.extensions=extensions
-        self.affiliate_member=affiliate_member or []
-        self.key_descriptor=key_descriptor or []
-        self.affiliation_owner_id=affiliation_owner_id
-        self.valid_until=valid_until
-        self.cache_duration=cache_duration
-        self.id=id
+                 signature=None,
+                 extensions=None,
+                 affiliate_member=None,
+                 key_descriptor=None,
+                 affiliation_owner_id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 id=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes,
+        )
+        self.signature = signature
+        self.extensions = extensions
+        self.affiliate_member = affiliate_member or []
+        self.key_descriptor = key_descriptor or []
+        self.affiliation_owner_id = affiliation_owner_id
+        self.valid_until = valid_until
+        self.cache_duration = cache_duration
+        self.id = id
+
 
 def affiliation_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(AffiliationDescriptorType_,
@@ -1451,6 +1448,7 @@ class RoleDescriptor(RoleDescriptorType_):
     c_child_order = RoleDescriptorType_.c_child_order[:]
     c_cardinality = RoleDescriptorType_.c_cardinality.copy()
 
+
 def role_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(RoleDescriptor, xml_string)
 
@@ -1465,12 +1463,14 @@ class IDPSSODescriptor(IDPSSODescriptorType_):
     c_child_order = IDPSSODescriptorType_.c_child_order[:]
     c_cardinality = IDPSSODescriptorType_.c_cardinality.copy()
 
+
 def idpsso_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(IDPSSODescriptor, xml_string)
 
 
 class AttributeConsumingService(AttributeConsumingServiceType_):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeConsumingService element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeConsumingService
+    element """
 
     c_tag = 'AttributeConsumingService'
     c_namespace = NAMESPACE
@@ -1479,13 +1479,15 @@ class AttributeConsumingService(AttributeConsumingServiceType_):
     c_child_order = AttributeConsumingServiceType_.c_child_order[:]
     c_cardinality = AttributeConsumingServiceType_.c_cardinality.copy()
 
+
 def attribute_consuming_service_from_string(xml_string):
     return saml2.create_class_from_xml_string(AttributeConsumingService,
                                               xml_string)
 
 
 class AuthnAuthorityDescriptor(AuthnAuthorityDescriptorType_):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AuthnAuthorityDescriptor element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AuthnAuthorityDescriptor
+    element """
 
     c_tag = 'AuthnAuthorityDescriptor'
     c_namespace = NAMESPACE
@@ -1494,6 +1496,7 @@ class AuthnAuthorityDescriptor(AuthnAuthorityDescriptorType_):
     c_child_order = AuthnAuthorityDescriptorType_.c_child_order[:]
     c_cardinality = AuthnAuthorityDescriptorType_.c_cardinality.copy()
 
+
 def authn_authority_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(AuthnAuthorityDescriptor,
                                               xml_string)
@@ -1509,12 +1512,14 @@ class PDPDescriptor(PDPDescriptorType_):
     c_child_order = PDPDescriptorType_.c_child_order[:]
     c_cardinality = PDPDescriptorType_.c_cardinality.copy()
 
+
 def pdp_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(PDPDescriptor, xml_string)
 
 
 class AttributeAuthorityDescriptor(AttributeAuthorityDescriptorType_):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeAuthorityDescriptor element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AttributeAuthorityDescriptor
+    element """
 
     c_tag = 'AttributeAuthorityDescriptor'
     c_namespace = NAMESPACE
@@ -1523,13 +1528,15 @@ class AttributeAuthorityDescriptor(AttributeAuthorityDescriptorType_):
     c_child_order = AttributeAuthorityDescriptorType_.c_child_order[:]
     c_cardinality = AttributeAuthorityDescriptorType_.c_cardinality.copy()
 
+
 def attribute_authority_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(AttributeAuthorityDescriptor,
                                               xml_string)
 
 
 class AffiliationDescriptor(AffiliationDescriptorType_):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:AffiliationDescriptor element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:AffiliationDescriptor element
+    """
 
     c_tag = 'AffiliationDescriptor'
     c_namespace = NAMESPACE
@@ -1538,6 +1545,7 @@ class AffiliationDescriptor(AffiliationDescriptorType_):
     c_child_order = AffiliationDescriptorType_.c_child_order[:]
     c_cardinality = AffiliationDescriptorType_.c_cardinality.copy()
 
+
 def affiliation_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(AffiliationDescriptor, xml_string)
 
@@ -1551,14 +1559,16 @@ class SPSSODescriptorType_(SSODescriptorType_):
     c_attributes = SSODescriptorType_.c_attributes.copy()
     c_child_order = SSODescriptorType_.c_child_order[:]
     c_cardinality = SSODescriptorType_.c_cardinality.copy()
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AssertionConsumerService'] = (
-                                                'assertion_consumer_service',
-                                                [AssertionConsumerService])
-    c_cardinality['assertion_consumer_service'] = {"min":1}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService'] = (
-                                                'attribute_consuming_service',
-                                                [AttributeConsumingService])
-    c_cardinality['attribute_consuming_service'] = {"min":0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AssertionConsumerService'] = (
+        'assertion_consumer_service',
+        [AssertionConsumerService])
+    c_cardinality['assertion_consumer_service'] = {"min": 1}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService'] = (
+        'attribute_consuming_service',
+        [AttributeConsumingService])
+    c_cardinality['attribute_consuming_service'] = {"min": 0}
     c_attributes['AuthnRequestsSigned'] = ('authn_requests_signed', 'boolean',
                                            False)
     c_attributes['WantAssertionsSigned'] = ('want_assertions_signed', 'boolean',
@@ -1567,51 +1577,52 @@ class SPSSODescriptorType_(SSODescriptorType_):
                           'attribute_consuming_service'])
 
     def __init__(self,
-            assertion_consumer_service=None,
-            attribute_consuming_service=None,
-            authn_requests_signed=None,
-            want_assertions_signed=None,
-            artifact_resolution_service=None,
-            single_logout_service=None,
-            manage_name_id_service=None,
-            name_id_format=None,
-            signature=None,
-            extensions=None,
-            key_descriptor=None,
-            organization=None,
-            contact_person=None,
-            id=None,
-            valid_until=None,
-            cache_duration=None,
-            protocol_support_enumeration=None,
-            error_url=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SSODescriptorType_.__init__(self, 
-                artifact_resolution_service=artifact_resolution_service,
-                single_logout_service=single_logout_service,
-                manage_name_id_service=manage_name_id_service,
-                name_id_format=name_id_format,
-                signature=signature,
-                extensions=extensions,
-                key_descriptor=key_descriptor,
-                organization=organization,
-                contact_person=contact_person,
-                id=id,
-                valid_until=valid_until,
-                cache_duration=cache_duration,
-                protocol_support_enumeration=protocol_support_enumeration,
-                error_url=error_url,
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.assertion_consumer_service=assertion_consumer_service or []
-        self.attribute_consuming_service=attribute_consuming_service or []
-        self.authn_requests_signed=authn_requests_signed
-        self.want_assertions_signed=want_assertions_signed
+                 assertion_consumer_service=None,
+                 attribute_consuming_service=None,
+                 authn_requests_signed=None,
+                 want_assertions_signed=None,
+                 artifact_resolution_service=None,
+                 single_logout_service=None,
+                 manage_name_id_service=None,
+                 name_id_format=None,
+                 signature=None,
+                 extensions=None,
+                 key_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 protocol_support_enumeration=None,
+                 error_url=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SSODescriptorType_.__init__(self,
+                                    artifact_resolution_service=artifact_resolution_service,
+                                    single_logout_service=single_logout_service,
+                                    manage_name_id_service=manage_name_id_service,
+                                    name_id_format=name_id_format,
+                                    signature=signature,
+                                    extensions=extensions,
+                                    key_descriptor=key_descriptor,
+                                    organization=organization,
+                                    contact_person=contact_person,
+                                    id=id,
+                                    valid_until=valid_until,
+                                    cache_duration=cache_duration,
+                                    protocol_support_enumeration=protocol_support_enumeration,
+                                    error_url=error_url,
+                                    text=text,
+                                    extension_elements=extension_elements,
+                                    extension_attributes=extension_attributes,
+        )
+        self.assertion_consumer_service = assertion_consumer_service or []
+        self.attribute_consuming_service = attribute_consuming_service or []
+        self.authn_requests_signed = authn_requests_signed
+        self.want_assertions_signed = want_assertions_signed
+
 
 def spsso_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(SPSSODescriptorType_, xml_string)
@@ -1627,6 +1638,7 @@ class SPSSODescriptor(SPSSODescriptorType_):
     c_child_order = SPSSODescriptorType_.c_child_order[:]
     c_cardinality = SPSSODescriptorType_.c_cardinality.copy()
 
+
 def spsso_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(SPSSODescriptor, xml_string)
 
@@ -1642,51 +1654,56 @@ class EntityDescriptorType_(SamlBase):
     c_cardinality = SamlBase.c_cardinality.copy()
     c_children['{http://www.w3.org/2000/09/xmldsig#}Signature'] = ('signature',
                                                                    ds.Signature)
-    c_cardinality['signature'] = {"min":0, "max":1}
+    c_cardinality['signature'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = (
-                                                            'extensions',
-                                                            Extensions)
-    c_cardinality['extensions'] = {"min":0, "max":1}
+        'extensions',
+        Extensions)
+    c_cardinality['extensions'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptor'] = (
-                                                            'role_descriptor',
-                                                            [RoleDescriptor])
-    c_cardinality['role_descriptor'] = {"min":0}
+        'role_descriptor',
+        [RoleDescriptor])
+    c_cardinality['role_descriptor'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptor'] = (
-                                                            'idpsso_descriptor',
-                                                            [IDPSSODescriptor])
-    c_cardinality['idpsso_descriptor'] = {"min":0}
+        'idpsso_descriptor',
+        [IDPSSODescriptor])
+    c_cardinality['idpsso_descriptor'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptor'] = (
-                                                            'spsso_descriptor',
-                                                            [SPSSODescriptor])
-    c_cardinality['spsso_descriptor'] = {"min":0}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptor'] = (
-                                            'authn_authority_descriptor',
-                                            [AuthnAuthorityDescriptor])
-    c_cardinality['authn_authority_descriptor'] = {"min":0}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptor'] = (
-                                            'attribute_authority_descriptor',
-                                            [AttributeAuthorityDescriptor])
-    c_cardinality['attribute_authority_descriptor'] = {"min":0}
+        'spsso_descriptor',
+        [SPSSODescriptor])
+    c_cardinality['spsso_descriptor'] = {"min": 0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptor'] = (
+        'authn_authority_descriptor',
+        [AuthnAuthorityDescriptor])
+    c_cardinality['authn_authority_descriptor'] = {"min": 0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptor']\
+        = (
+        'attribute_authority_descriptor',
+        [AttributeAuthorityDescriptor])
+    c_cardinality['attribute_authority_descriptor'] = {"min": 0}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptor'] = (
-                                                            'pdp_descriptor',
-                                                            [PDPDescriptor])
-    c_cardinality['pdp_descriptor'] = {"min":0}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptor'] = (
-                                                    'affiliation_descriptor',
-                                                    AffiliationDescriptor)
-    c_cardinality['affiliation_descriptor'] = {"min":0, "max":1}
+        'pdp_descriptor',
+        [PDPDescriptor])
+    c_cardinality['pdp_descriptor'] = {"min": 0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptor'] = (
+        'affiliation_descriptor',
+        AffiliationDescriptor)
+    c_cardinality['affiliation_descriptor'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Organization'] = (
-                                                            'organization',
-                                                            Organization)
-    c_cardinality['organization'] = {"min":0, "max":1}
+        'organization',
+        Organization)
+    c_cardinality['organization'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson'] = (
-                                                            'contact_person',
-                                                            [ContactPerson])
-    c_cardinality['contact_person'] = {"min":0}
-    c_children['{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocation'] = (
-                                            'additional_metadata_location',
-                                            [AdditionalMetadataLocation])
-    c_cardinality['additional_metadata_location'] = {"min":0}
+        'contact_person',
+        [ContactPerson])
+    c_cardinality['contact_person'] = {"min": 0}
+    c_children[
+        '{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocation'] = (
+        'additional_metadata_location',
+        [AdditionalMetadataLocation])
+    c_cardinality['additional_metadata_location'] = {"min": 0}
     c_attributes['entityID'] = ('entity_id', EntityIDType_, True)
     c_attributes['validUntil'] = ('valid_until', 'dateTime', False)
     c_attributes['cacheDuration'] = ('cache_duration', 'duration', False)
@@ -1699,47 +1716,49 @@ class EntityDescriptorType_(SamlBase):
                           'contact_person', 'additional_metadata_location'])
 
     def __init__(self,
-            signature=None,
-            extensions=None,
-            role_descriptor=None,
-            idpsso_descriptor=None,
-            spsso_descriptor=None,
-            authn_authority_descriptor=None,
-            attribute_authority_descriptor=None,
-            pdp_descriptor=None,
-            affiliation_descriptor=None,
-            organization=None,
-            contact_person=None,
-            additional_metadata_location=None,
-            entity_id=None,
-            valid_until=None,
-            cache_duration=None,
-            id=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.signature=signature
-        self.extensions=extensions
-        self.role_descriptor=role_descriptor or []
-        self.idpsso_descriptor=idpsso_descriptor or []
-        self.spsso_descriptor=spsso_descriptor or []
-        self.authn_authority_descriptor=authn_authority_descriptor or []
-        self.attribute_authority_descriptor=attribute_authority_descriptor or []
-        self.pdp_descriptor=pdp_descriptor or []
-        self.affiliation_descriptor=affiliation_descriptor
-        self.organization=organization
-        self.contact_person=contact_person or []
-        self.additional_metadata_location=additional_metadata_location or []
-        self.entity_id=entity_id
-        self.valid_until=valid_until
-        self.cache_duration=cache_duration
-        self.id=id
+                 signature=None,
+                 extensions=None,
+                 role_descriptor=None,
+                 idpsso_descriptor=None,
+                 spsso_descriptor=None,
+                 authn_authority_descriptor=None,
+                 attribute_authority_descriptor=None,
+                 pdp_descriptor=None,
+                 affiliation_descriptor=None,
+                 organization=None,
+                 contact_person=None,
+                 additional_metadata_location=None,
+                 entity_id=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 id=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes,
+        )
+        self.signature = signature
+        self.extensions = extensions
+        self.role_descriptor = role_descriptor or []
+        self.idpsso_descriptor = idpsso_descriptor or []
+        self.spsso_descriptor = spsso_descriptor or []
+        self.authn_authority_descriptor = authn_authority_descriptor or []
+        self.attribute_authority_descriptor = attribute_authority_descriptor \
+            or []
+        self.pdp_descriptor = pdp_descriptor or []
+        self.affiliation_descriptor = affiliation_descriptor
+        self.organization = organization
+        self.contact_person = contact_person or []
+        self.additional_metadata_location = additional_metadata_location or []
+        self.entity_id = entity_id
+        self.valid_until = valid_until
+        self.cache_duration = cache_duration
+        self.id = id
+
 
 def entity_descriptor_type__from_string(xml_string):
     return saml2.create_class_from_xml_string(EntityDescriptorType_, xml_string)
@@ -1755,6 +1774,7 @@ class EntityDescriptor(EntityDescriptorType_):
     c_child_order = EntityDescriptorType_.c_child_order[:]
     c_cardinality = EntityDescriptorType_.c_cardinality.copy()
 
+
 def entity_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(EntityDescriptor, xml_string)
 
@@ -1762,7 +1782,8 @@ def entity_descriptor_from_string(xml_string):
 #..................
 # ['EntitiesDescriptor', 'EntitiesDescriptorType']
 class EntitiesDescriptorType_(SamlBase):
-    """The urn:oasis:names:tc:SAML:2.0:metadata:EntitiesDescriptorType element """
+    """The urn:oasis:names:tc:SAML:2.0:metadata:EntitiesDescriptorType
+    element """
 
     c_tag = 'EntitiesDescriptorType'
     c_namespace = NAMESPACE
@@ -1772,16 +1793,16 @@ class EntitiesDescriptorType_(SamlBase):
     c_cardinality = SamlBase.c_cardinality.copy()
     c_children['{http://www.w3.org/2000/09/xmldsig#}Signature'] = ('signature',
                                                                    ds.Signature)
-    c_cardinality['signature'] = {"min":0, "max":1}
+    c_cardinality['signature'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}Extensions'] = (
-                                                                'extensions',
-                                                                Extensions)
-    c_cardinality['extensions'] = {"min":0, "max":1}
+        'extensions',
+        Extensions)
+    c_cardinality['extensions'] = {"min": 0, "max": 1}
     c_children['{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptor'] = (
-                                                            'entity_descriptor',
-                                                            [EntityDescriptor])
-    c_cardinality['entity_descriptor'] = {"min":0}
-    c_cardinality['entities_descriptor'] = {"min":0}
+        'entity_descriptor',
+        [EntityDescriptor])
+    c_cardinality['entity_descriptor'] = {"min": 0}
+    c_cardinality['entities_descriptor'] = {"min": 0}
     c_attributes['validUntil'] = ('valid_until', 'dateTime', False)
     c_attributes['cacheDuration'] = ('cache_duration', 'duration', False)
     c_attributes['ID'] = ('id', 'ID', False)
@@ -1790,34 +1811,36 @@ class EntitiesDescriptorType_(SamlBase):
                           'entities_descriptor'])
 
     def __init__(self,
-            signature=None,
-            extensions=None,
-            entity_descriptor=None,
-            entities_descriptor=None,
-            valid_until=None,
-            cache_duration=None,
-            id=None,
-            name=None,
-            text=None,
-            extension_elements=None,
-            extension_attributes=None,
-        ):
-        SamlBase.__init__(self, 
-                text=text,
-                extension_elements=extension_elements,
-                extension_attributes=extension_attributes,
-                )
-        self.signature=signature
-        self.extensions=extensions
-        self.entity_descriptor=entity_descriptor or []
-        self.entities_descriptor=entities_descriptor or []
-        self.valid_until=valid_until
-        self.cache_duration=cache_duration
-        self.id=id
-        self.name=name
+                 signature=None,
+                 extensions=None,
+                 entity_descriptor=None,
+                 entities_descriptor=None,
+                 valid_until=None,
+                 cache_duration=None,
+                 id=None,
+                 name=None,
+                 text=None,
+                 extension_elements=None,
+                 extension_attributes=None,
+    ):
+        SamlBase.__init__(self,
+                          text=text,
+                          extension_elements=extension_elements,
+                          extension_attributes=extension_attributes,
+        )
+        self.signature = signature
+        self.extensions = extensions
+        self.entity_descriptor = entity_descriptor or []
+        self.entities_descriptor = entities_descriptor or []
+        self.valid_until = valid_until
+        self.cache_duration = cache_duration
+        self.id = id
+        self.name = name
+
 
 def entities_descriptor_type__from_string(xml_string):
-    return saml2.create_class_from_xml_string(EntitiesDescriptorType_, xml_string)
+    return saml2.create_class_from_xml_string(EntitiesDescriptorType_,
+                                              xml_string)
 
 
 class EntitiesDescriptor(EntitiesDescriptorType_):
@@ -1830,17 +1853,20 @@ class EntitiesDescriptor(EntitiesDescriptorType_):
     c_child_order = EntitiesDescriptorType_.c_child_order[:]
     c_cardinality = EntitiesDescriptorType_.c_cardinality.copy()
 
+
 def entities_descriptor_from_string(xml_string):
     return saml2.create_class_from_xml_string(EntitiesDescriptor, xml_string)
 
 
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-EntitiesDescriptorType_.c_children['{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor'] = (
-                                                    'entities_descriptor',
-                                                    [EntitiesDescriptor])
-EntitiesDescriptor.c_children['{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor'] = (
-                                                    'entities_descriptor',
-                                                    [EntitiesDescriptor])
+EntitiesDescriptorType_.c_children[
+    '{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor'] = (
+    'entities_descriptor',
+    [EntitiesDescriptor])
+EntitiesDescriptor.c_children[
+    '{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor'] = (
+    'entities_descriptor',
+    [EntitiesDescriptor])
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 ELEMENT_FROM_STRING = {
@@ -1869,7 +1895,8 @@ ELEMENT_FROM_STRING = {
     TelephoneNumber.c_tag: telephone_number_from_string,
     ContactTypeType_.c_tag: contact_type_type__from_string,
     AdditionalMetadataLocation.c_tag: additional_metadata_location_from_string,
-    AdditionalMetadataLocationType_.c_tag: additional_metadata_location_type__from_string,
+    AdditionalMetadataLocationType_.c_tag:
+        additional_metadata_location_type__from_string,
     RoleDescriptor.c_tag: role_descriptor_from_string,
     AnyURIListType_.c_tag: any_uri_list_type__from_string,
     KeyDescriptor.c_tag: key_descriptor_from_string,
@@ -1890,19 +1917,23 @@ ELEMENT_FROM_STRING = {
     SPSSODescriptorType_.c_tag: spsso_descriptor_type__from_string,
     AssertionConsumerService.c_tag: assertion_consumer_service_from_string,
     AttributeConsumingService.c_tag: attribute_consuming_service_from_string,
-    AttributeConsumingServiceType_.c_tag: attribute_consuming_service_type__from_string,
+    AttributeConsumingServiceType_.c_tag:
+        attribute_consuming_service_type__from_string,
     ServiceName.c_tag: service_name_from_string,
     ServiceDescription.c_tag: service_description_from_string,
     RequestedAttribute.c_tag: requested_attribute_from_string,
     RequestedAttributeType_.c_tag: requested_attribute_type__from_string,
     AuthnAuthorityDescriptor.c_tag: authn_authority_descriptor_from_string,
-    AuthnAuthorityDescriptorType_.c_tag: authn_authority_descriptor_type__from_string,
+    AuthnAuthorityDescriptorType_.c_tag:
+        authn_authority_descriptor_type__from_string,
     AuthnQueryService.c_tag: authn_query_service_from_string,
     PDPDescriptor.c_tag: pdp_descriptor_from_string,
     PDPDescriptorType_.c_tag: pdp_descriptor_type__from_string,
     AuthzService.c_tag: authz_service_from_string,
-    AttributeAuthorityDescriptor.c_tag: attribute_authority_descriptor_from_string,
-    AttributeAuthorityDescriptorType_.c_tag: attribute_authority_descriptor_type__from_string,
+    AttributeAuthorityDescriptor.c_tag:
+        attribute_authority_descriptor_from_string,
+    AttributeAuthorityDescriptorType_.c_tag:
+        attribute_authority_descriptor_type__from_string,
     AttributeService.c_tag: attribute_service_from_string,
     AffiliationDescriptor.c_tag: affiliation_descriptor_from_string,
     AffiliationDescriptorType_.c_tag: affiliation_descriptor_type__from_string,