Fix pep8

Author: pitbulk

src/onelogin/saml2/metadata.py

@@ -89,7 +89,7 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
         if len(organization) > 0:
             organization_info = []
             for (lang, info) in organization.items():
-                organization_info.append("""    <md:Organization>
+                org = """    <md:Organization>
         <md:OrganizationName xml:lang="%(lang)s">%(name)s</md:OrganizationName>
         <md:OrganizationDisplayName xml:lang="%(lang)s">%(display_name)s</md:OrganizationDisplayName>
         <md:OrganizationURL xml:lang="%(lang)s">%(url)s</md:OrganizationURL>
@@ -99,22 +99,24 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
                         'name': info['name'],
                         'display_name': info['displayname'],
                         'url': info['url'],
-                    })
+                    }
+                organization_info.append(org)
             str_organization = '\n'.join(organization_info)
 
         str_contacts = ''
         if len(contacts) > 0:
             contacts_info = []
             for (ctype, info) in contacts.items():
-                contacts_info.append("""    <md:ContactPerson contactType="%(type)s">
+                contact = """    <md:ContactPerson contactType="%(type)s">
         <md:GivenName>%(name)s</md:GivenName>
         <md:EmailAddress>%(email)s</md:EmailAddress>
     </md:ContactPerson>""" % \
                     {
                         'type': ctype,
                         'name': info['givenName'],
                         'email': info['emailAddress'],
-                    })
+                    }
+                contacts_info.append(contact)
             str_contacts = '\n'.join(contacts_info)
 
         metadata = """<?xml version="1.0"?>

src/onelogin/saml2/settings.py

@@ -364,25 +364,32 @@ def check_settings(self, settings):
                         'certFileName' not in security['signMetadata']:
                     errors.append('sp_signMetadata_invalid')
 
-            if (('authnRequestsSigned' in security and security['authnRequestsSigned']) or \
-                 ('logoutRequestSigned' in security and security['logoutRequestSigned']) or \
-                 ('logoutResponseSigned' in security and security['logoutResponseSigned']) or \
-                 ('wantAssertionsEncrypted' in security and security['wantAssertionsEncrypted']) or \
-                 ('wantNameIdEncrypted' in security and security['wantNameIdEncrypted'])) and \
-                    not self.check_sp_certs():
-                errors.append('sp_cert_not_found_and_required')
+            authn_sign = 'authnRequestsSigned' in security.keys() and security['authnRequestsSigned']
+            logout_req_sign = 'logoutRequestSigned' in security.keys() and security['logoutRequestSigned']
+            logout_res_sign = 'logoutResponseSigned' in security.keys() and security['logoutResponseSigned']
+            want_assert_enc = 'wantAssertionsEncrypted' in security.keys() and security['wantAssertionsEncrypted']
+            want_nameid_enc = 'wantNameIdEncrypted' in security.keys() and security['wantNameIdEncrypted']
+
+            if not self.check_sp_certs():
+                if authn_sign or logout_req_sign or logout_res_sign or \
+                   want_assert_enc or want_nameid_enc:
+                    errors.append('sp_cert_not_found_and_required')
 
             exists_x509 = ('idp' in settings and
                            'x509cert' in settings['idp'] and
                            len(settings['idp']['x509cert']) > 0)
             exists_fingerprint = ('idp' in settings and
                                   'certFingerprint' in settings['idp'] and
                                   len(settings['idp']['certFingerprint']) > 0)
-            if (('wantAssertionsSigned' in security and security['wantAssertionsSigned']) or \
-                 ('wantMessagesSigned' in security and security['wantMessagesSigned'])) and \
+
+            want_assert_sign = 'wantAssertionsSigned' in security.keys() and security['wantAssertionsSigned']
+            want_mes_signed = 'wantMessagesSigned' in security.keys() and security['wantMessagesSigned']
+            nameid_enc = 'nameIdEncrypted' in security.keys() and security['nameIdEncrypted']
+
+            if (want_assert_sign or want_mes_signed) and \
                     not(exists_x509 or exists_fingerprint):
                 errors.append('idp_cert_or_fingerprint_not_found_and_required')
-            if ('nameIdEncrypted' in security and security['nameIdEncrypted']) and not exists_x509:
+            if nameid_enc and not exists_x509:
                 errors.append('idp_cert_not_found_and_required')
 
         if 'contactPerson' in settings: