Run flynt -tc + black + isort

9 files changed, 726 insertions, 726 deletions

diff --git a/example/attributemaps/saml_uri.py b/example/attributemaps/saml_uri.py
index aa02559f..5f5d9145 100644
--- a/example/attributemaps/saml_uri.py
+++ b/example/attributemaps/saml_uri.py
@@ -11,189 +11,189 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57."
 MAP = {
     "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
     "fro": {
-        EDUPERSON_OID + "2": "eduPersonNickname",
-        EDUPERSON_OID + "9": "eduPersonScopedAffiliation",
-        EDUPERSON_OID + "11": "eduPersonAssurance",
-        EDUPERSON_OID + "10": "eduPersonTargetedID",
-        EDUPERSON_OID + "4": "eduPersonOrgUnitDN",
-        NOREDUPERSON_OID + "6": "norEduOrgAcronym",
-        NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier",
-        NOREDUPERSON_OID + "4": "norEduPersonLIN",
-        EDUPERSON_OID + "1": "eduPersonAffiliation",
-        NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber",
-        NETSCAPE_LDAP + "40": "userSMIMECertificate",
-        NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber",
-        NETSCAPE_LDAP + "241": "displayName",
-        UCL_DIR_PILOT + "37": "associatedDomain",
-        EDUPERSON_OID + "6": "eduPersonPrincipalName",
-        NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier",
-        NOREDUPERSON_OID + "9": "federationFeideSchemaVersion",
-        X500ATTR_OID + "53": "deltaRevocationList",
-        X500ATTR_OID + "52": "supportedAlgorithms",
-        X500ATTR_OID + "51": "houseIdentifier",
-        X500ATTR_OID + "50": "uniqueMember",
-        X500ATTR_OID + "19": "physicalDeliveryOfficeName",
-        X500ATTR_OID + "18": "postOfficeBox",
-        X500ATTR_OID + "17": "postalCode",
-        X500ATTR_OID + "16": "postalAddress",
-        X500ATTR_OID + "15": "businessCategory",
-        X500ATTR_OID + "14": "searchGuide",
-        EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation",
-        X500ATTR_OID + "12": "title",
-        X500ATTR_OID + "11": "ou",
-        X500ATTR_OID + "10": "o",
-        X500ATTR_OID + "37": "cACertificate",
-        X500ATTR_OID + "36": "userCertificate",
-        X500ATTR_OID + "31": "member",
-        X500ATTR_OID + "30": "supportedApplicationContext",
-        X500ATTR_OID + "33": "roleOccupant",
-        X500ATTR_OID + "32": "owner",
-        NETSCAPE_LDAP + "1": "carLicense",
-        PKCS_9 + "1": "email",
-        NETSCAPE_LDAP + "3": "employeeNumber",
-        NETSCAPE_LDAP + "2": "departmentNumber",
-        X500ATTR_OID + "39": "certificateRevocationList",
-        X500ATTR_OID + "38": "authorityRevocationList",
-        NETSCAPE_LDAP + "216": "userPKCS12",
-        EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN",
-        X500ATTR_OID + "9": "street",
-        X500ATTR_OID + "8": "st",
-        NETSCAPE_LDAP + "39": "preferredLanguage",
-        EDUPERSON_OID + "7": "eduPersonEntitlement",
-        X500ATTR_OID + "2": "knowledgeInformation",
-        X500ATTR_OID + "7": "l",
-        X500ATTR_OID + "6": "c",
-        X500ATTR_OID + "5": "serialNumber",
-        X500ATTR_OID + "4": "sn",
-        UCL_DIR_PILOT + "60": "jpegPhoto",
-        X500ATTR_OID + "65": "pseudonym",
-        NOREDUPERSON_OID + "5": "norEduPersonNIN",
-        UCL_DIR_PILOT + "3": "mail",
-        UCL_DIR_PILOT + "25": "dc",
-        X500ATTR_OID + "40": "crossCertificatePair",
-        X500ATTR_OID + "42": "givenName",
-        X500ATTR_OID + "43": "initials",
-        X500ATTR_OID + "44": "generationQualifier",
-        X500ATTR_OID + "45": "x500UniqueIdentifier",
-        X500ATTR_OID + "46": "dnQualifier",
-        X500ATTR_OID + "47": "enhancedSearchGuide",
-        X500ATTR_OID + "48": "protocolInformation",
-        X500ATTR_OID + "54": "dmdName",
-        NETSCAPE_LDAP + "4": "employeeType",
-        X500ATTR_OID + "22": "teletexTerminalIdentifier",
-        X500ATTR_OID + "23": "facsimileTelephoneNumber",
-        X500ATTR_OID + "20": "telephoneNumber",
-        X500ATTR_OID + "21": "telexNumber",
-        X500ATTR_OID + "26": "registeredAddress",
-        X500ATTR_OID + "27": "destinationIndicator",
-        X500ATTR_OID + "24": "x121Address",
-        X500ATTR_OID + "25": "internationaliSDNNumber",
-        X500ATTR_OID + "28": "preferredDeliveryMethod",
-        X500ATTR_OID + "29": "presentationAddress",
-        EDUPERSON_OID + "3": "eduPersonOrgDN",
-        NOREDUPERSON_OID + "3": "norEduPersonBirthDate",
-        UMICH + "57": "labeledURI",
-        UCL_DIR_PILOT + "1": "uid",
+        f"{EDUPERSON_OID}2": "eduPersonNickname",
+        f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation",
+        f"{EDUPERSON_OID}11": "eduPersonAssurance",
+        f"{EDUPERSON_OID}10": "eduPersonTargetedID",
+        f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN",
+        f"{NOREDUPERSON_OID}6": "norEduOrgAcronym",
+        f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier",
+        f"{NOREDUPERSON_OID}4": "norEduPersonLIN",
+        f"{EDUPERSON_OID}1": "eduPersonAffiliation",
+        f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber",
+        f"{NETSCAPE_LDAP}40": "userSMIMECertificate",
+        f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber",
+        f"{NETSCAPE_LDAP}241": "displayName",
+        f"{UCL_DIR_PILOT}37": "associatedDomain",
+        f"{EDUPERSON_OID}6": "eduPersonPrincipalName",
+        f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier",
+        f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion",
+        f"{X500ATTR_OID}53": "deltaRevocationList",
+        f"{X500ATTR_OID}52": "supportedAlgorithms",
+        f"{X500ATTR_OID}51": "houseIdentifier",
+        f"{X500ATTR_OID}50": "uniqueMember",
+        f"{X500ATTR_OID}19": "physicalDeliveryOfficeName",
+        f"{X500ATTR_OID}18": "postOfficeBox",
+        f"{X500ATTR_OID}17": "postalCode",
+        f"{X500ATTR_OID}16": "postalAddress",
+        f"{X500ATTR_OID}15": "businessCategory",
+        f"{X500ATTR_OID}14": "searchGuide",
+        f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation",
+        f"{X500ATTR_OID}12": "title",
+        f"{X500ATTR_OID}11": "ou",
+        f"{X500ATTR_OID}10": "o",
+        f"{X500ATTR_OID}37": "cACertificate",
+        f"{X500ATTR_OID}36": "userCertificate",
+        f"{X500ATTR_OID}31": "member",
+        f"{X500ATTR_OID}30": "supportedApplicationContext",
+        f"{X500ATTR_OID}33": "roleOccupant",
+        f"{X500ATTR_OID}32": "owner",
+        f"{NETSCAPE_LDAP}1": "carLicense",
+        f"{PKCS_9}1": "email",
+        f"{NETSCAPE_LDAP}3": "employeeNumber",
+        f"{NETSCAPE_LDAP}2": "departmentNumber",
+        f"{X500ATTR_OID}39": "certificateRevocationList",
+        f"{X500ATTR_OID}38": "authorityRevocationList",
+        f"{NETSCAPE_LDAP}216": "userPKCS12",
+        f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN",
+        f"{X500ATTR_OID}9": "street",
+        f"{X500ATTR_OID}8": "st",
+        f"{NETSCAPE_LDAP}39": "preferredLanguage",
+        f"{EDUPERSON_OID}7": "eduPersonEntitlement",
+        f"{X500ATTR_OID}2": "knowledgeInformation",
+        f"{X500ATTR_OID}7": "l",
+        f"{X500ATTR_OID}6": "c",
+        f"{X500ATTR_OID}5": "serialNumber",
+        f"{X500ATTR_OID}4": "sn",
+        f"{UCL_DIR_PILOT}60": "jpegPhoto",
+        f"{X500ATTR_OID}65": "pseudonym",
+        f"{NOREDUPERSON_OID}5": "norEduPersonNIN",
+        f"{UCL_DIR_PILOT}3": "mail",
+        f"{UCL_DIR_PILOT}25": "dc",
+        f"{X500ATTR_OID}40": "crossCertificatePair",
+        f"{X500ATTR_OID}42": "givenName",
+        f"{X500ATTR_OID}43": "initials",
+        f"{X500ATTR_OID}44": "generationQualifier",
+        f"{X500ATTR_OID}45": "x500UniqueIdentifier",
+        f"{X500ATTR_OID}46": "dnQualifier",
+        f"{X500ATTR_OID}47": "enhancedSearchGuide",
+        f"{X500ATTR_OID}48": "protocolInformation",
+        f"{X500ATTR_OID}54": "dmdName",
+        f"{NETSCAPE_LDAP}4": "employeeType",
+        f"{X500ATTR_OID}22": "teletexTerminalIdentifier",
+        f"{X500ATTR_OID}23": "facsimileTelephoneNumber",
+        f"{X500ATTR_OID}20": "telephoneNumber",
+        f"{X500ATTR_OID}21": "telexNumber",
+        f"{X500ATTR_OID}26": "registeredAddress",
+        f"{X500ATTR_OID}27": "destinationIndicator",
+        f"{X500ATTR_OID}24": "x121Address",
+        f"{X500ATTR_OID}25": "internationaliSDNNumber",
+        f"{X500ATTR_OID}28": "preferredDeliveryMethod",
+        f"{X500ATTR_OID}29": "presentationAddress",
+        f"{EDUPERSON_OID}3": "eduPersonOrgDN",
+        f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate",
+        f"{UMICH}57": "labeledURI",
+        f"{UCL_DIR_PILOT}1": "uid",
     },
     "to": {
-        "roleOccupant": X500ATTR_OID + "33",
-        "gn": X500ATTR_OID + "42",
-        "norEduPersonNIN": NOREDUPERSON_OID + "5",
-        "title": X500ATTR_OID + "12",
-        "facsimileTelephoneNumber": X500ATTR_OID + "23",
-        "mail": UCL_DIR_PILOT + "3",
-        "postOfficeBox": X500ATTR_OID + "18",
-        "fax": X500ATTR_OID + "23",
-        "telephoneNumber": X500ATTR_OID + "20",
-        "norEduPersonBirthDate": NOREDUPERSON_OID + "3",
-        "rfc822Mailbox": UCL_DIR_PILOT + "3",
-        "dc": UCL_DIR_PILOT + "25",
-        "countryName": X500ATTR_OID + "6",
-        "emailAddress": PKCS_9 + "1",
-        "employeeNumber": NETSCAPE_LDAP + "3",
-        "organizationName": X500ATTR_OID + "10",
-        "eduPersonAssurance": EDUPERSON_OID + "11",
-        "norEduOrgAcronym": NOREDUPERSON_OID + "6",
-        "registeredAddress": X500ATTR_OID + "26",
-        "physicalDeliveryOfficeName": X500ATTR_OID + "19",
-        "associatedDomain": UCL_DIR_PILOT + "37",
-        "l": X500ATTR_OID + "7",
-        "stateOrProvinceName": X500ATTR_OID + "8",
-        "federationFeideSchemaVersion": NOREDUPERSON_OID + "9",
-        "pkcs9email": PKCS_9 + "1",
-        "givenName": X500ATTR_OID + "42",
-        "givenname": X500ATTR_OID + "42",
-        "x500UniqueIdentifier": X500ATTR_OID + "45",
-        "eduPersonNickname": EDUPERSON_OID + "2",
-        "houseIdentifier": X500ATTR_OID + "51",
-        "street": X500ATTR_OID + "9",
-        "supportedAlgorithms": X500ATTR_OID + "52",
-        "preferredLanguage": NETSCAPE_LDAP + "39",
-        "postalAddress": X500ATTR_OID + "16",
-        "email": PKCS_9 + "1",
-        "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8",
-        "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8",
-        "c": X500ATTR_OID + "6",
-        "teletexTerminalIdentifier": X500ATTR_OID + "22",
-        "o": X500ATTR_OID + "10",
-        "cACertificate": X500ATTR_OID + "37",
-        "telexNumber": X500ATTR_OID + "21",
-        "ou": X500ATTR_OID + "11",
-        "initials": X500ATTR_OID + "43",
-        "eduPersonOrgUnitDN": EDUPERSON_OID + "4",
-        "deltaRevocationList": X500ATTR_OID + "53",
-        "norEduPersonLIN": NOREDUPERSON_OID + "4",
-        "supportedApplicationContext": X500ATTR_OID + "30",
-        "eduPersonEntitlement": EDUPERSON_OID + "7",
-        "generationQualifier": X500ATTR_OID + "44",
-        "eduPersonAffiliation": EDUPERSON_OID + "1",
-        "eduPersonPrincipalName": EDUPERSON_OID + "6",
-        "edupersonprincipalname": EDUPERSON_OID + "6",
-        "localityName": X500ATTR_OID + "7",
-        "owner": X500ATTR_OID + "32",
-        "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2",
-        "searchGuide": X500ATTR_OID + "14",
-        "certificateRevocationList": X500ATTR_OID + "39",
-        "organizationalUnitName": X500ATTR_OID + "11",
-        "userCertificate": X500ATTR_OID + "36",
-        "preferredDeliveryMethod": X500ATTR_OID + "28",
-        "internationaliSDNNumber": X500ATTR_OID + "25",
-        "uniqueMember": X500ATTR_OID + "50",
-        "departmentNumber": NETSCAPE_LDAP + "2",
-        "enhancedSearchGuide": X500ATTR_OID + "47",
-        "userPKCS12": NETSCAPE_LDAP + "216",
-        "eduPersonTargetedID": EDUPERSON_OID + "10",
-        "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1",
-        "x121Address": X500ATTR_OID + "24",
-        "destinationIndicator": X500ATTR_OID + "27",
-        "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5",
-        "surname": X500ATTR_OID + "4",
-        "jpegPhoto": UCL_DIR_PILOT + "60",
-        "eduPersonScopedAffiliation": EDUPERSON_OID + "9",
-        "edupersonscopedaffiliation": EDUPERSON_OID + "9",
-        "protocolInformation": X500ATTR_OID + "48",
-        "knowledgeInformation": X500ATTR_OID + "2",
-        "employeeType": NETSCAPE_LDAP + "4",
-        "userSMIMECertificate": NETSCAPE_LDAP + "40",
-        "member": X500ATTR_OID + "31",
-        "streetAddress": X500ATTR_OID + "9",
-        "dmdName": X500ATTR_OID + "54",
-        "postalCode": X500ATTR_OID + "17",
-        "pseudonym": X500ATTR_OID + "65",
-        "dnQualifier": X500ATTR_OID + "46",
-        "crossCertificatePair": X500ATTR_OID + "40",
-        "eduPersonOrgDN": EDUPERSON_OID + "3",
-        "authorityRevocationList": X500ATTR_OID + "38",
-        "displayName": NETSCAPE_LDAP + "241",
-        "businessCategory": X500ATTR_OID + "15",
-        "serialNumber": X500ATTR_OID + "5",
-        "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7",
-        "st": X500ATTR_OID + "8",
-        "carLicense": NETSCAPE_LDAP + "1",
-        "presentationAddress": X500ATTR_OID + "29",
-        "sn": X500ATTR_OID + "4",
-        "domainComponent": UCL_DIR_PILOT + "25",
-        "labeledURI": UMICH + "57",
-        "uid": UCL_DIR_PILOT + "1",
+        "roleOccupant": f"{X500ATTR_OID}33",
+        "gn": f"{X500ATTR_OID}42",
+        "norEduPersonNIN": f"{NOREDUPERSON_OID}5",
+        "title": f"{X500ATTR_OID}12",
+        "facsimileTelephoneNumber": f"{X500ATTR_OID}23",
+        "mail": f"{UCL_DIR_PILOT}3",
+        "postOfficeBox": f"{X500ATTR_OID}18",
+        "fax": f"{X500ATTR_OID}23",
+        "telephoneNumber": f"{X500ATTR_OID}20",
+        "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3",
+        "rfc822Mailbox": f"{UCL_DIR_PILOT}3",
+        "dc": f"{UCL_DIR_PILOT}25",
+        "countryName": f"{X500ATTR_OID}6",
+        "emailAddress": f"{PKCS_9}1",
+        "employeeNumber": f"{NETSCAPE_LDAP}3",
+        "organizationName": f"{X500ATTR_OID}10",
+        "eduPersonAssurance": f"{EDUPERSON_OID}11",
+        "norEduOrgAcronym": f"{NOREDUPERSON_OID}6",
+        "registeredAddress": f"{X500ATTR_OID}26",
+        "physicalDeliveryOfficeName": f"{X500ATTR_OID}19",
+        "associatedDomain": f"{UCL_DIR_PILOT}37",
+        "l": f"{X500ATTR_OID}7",
+        "stateOrProvinceName": f"{X500ATTR_OID}8",
+        "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9",
+        "pkcs9email": f"{PKCS_9}1",
+        "givenName": f"{X500ATTR_OID}42",
+        "givenname": f"{X500ATTR_OID}42",
+        "x500UniqueIdentifier": f"{X500ATTR_OID}45",
+        "eduPersonNickname": f"{EDUPERSON_OID}2",
+        "houseIdentifier": f"{X500ATTR_OID}51",
+        "street": f"{X500ATTR_OID}9",
+        "supportedAlgorithms": f"{X500ATTR_OID}52",
+        "preferredLanguage": f"{NETSCAPE_LDAP}39",
+        "postalAddress": f"{X500ATTR_OID}16",
+        "email": f"{PKCS_9}1",
+        "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8",
+        "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8",
+        "c": f"{X500ATTR_OID}6",
+        "teletexTerminalIdentifier": f"{X500ATTR_OID}22",
+        "o": f"{X500ATTR_OID}10",
+        "cACertificate": f"{X500ATTR_OID}37",
+        "telexNumber": f"{X500ATTR_OID}21",
+        "ou": f"{X500ATTR_OID}11",
+        "initials": f"{X500ATTR_OID}43",
+        "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4",
+        "deltaRevocationList": f"{X500ATTR_OID}53",
+        "norEduPersonLIN": f"{NOREDUPERSON_OID}4",
+        "supportedApplicationContext": f"{X500ATTR_OID}30",
+        "eduPersonEntitlement": f"{EDUPERSON_OID}7",
+        "generationQualifier": f"{X500ATTR_OID}44",
+        "eduPersonAffiliation": f"{EDUPERSON_OID}1",
+        "eduPersonPrincipalName": f"{EDUPERSON_OID}6",
+        "edupersonprincipalname": f"{EDUPERSON_OID}6",
+        "localityName": f"{X500ATTR_OID}7",
+        "owner": f"{X500ATTR_OID}32",
+        "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2",
+        "searchGuide": f"{X500ATTR_OID}14",
+        "certificateRevocationList": f"{X500ATTR_OID}39",
+        "organizationalUnitName": f"{X500ATTR_OID}11",
+        "userCertificate": f"{X500ATTR_OID}36",
+        "preferredDeliveryMethod": f"{X500ATTR_OID}28",
+        "internationaliSDNNumber": f"{X500ATTR_OID}25",
+        "uniqueMember": f"{X500ATTR_OID}50",
+        "departmentNumber": f"{NETSCAPE_LDAP}2",
+        "enhancedSearchGuide": f"{X500ATTR_OID}47",
+        "userPKCS12": f"{NETSCAPE_LDAP}216",
+        "eduPersonTargetedID": f"{EDUPERSON_OID}10",
+        "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1",
+        "x121Address": f"{X500ATTR_OID}24",
+        "destinationIndicator": f"{X500ATTR_OID}27",
+        "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5",
+        "surname": f"{X500ATTR_OID}4",
+        "jpegPhoto": f"{UCL_DIR_PILOT}60",
+        "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9",
+        "edupersonscopedaffiliation": f"{EDUPERSON_OID}9",
+        "protocolInformation": f"{X500ATTR_OID}48",
+        "knowledgeInformation": f"{X500ATTR_OID}2",
+        "employeeType": f"{NETSCAPE_LDAP}4",
+        "userSMIMECertificate": f"{NETSCAPE_LDAP}40",
+        "member": f"{X500ATTR_OID}31",
+        "streetAddress": f"{X500ATTR_OID}9",
+        "dmdName": f"{X500ATTR_OID}54",
+        "postalCode": f"{X500ATTR_OID}17",
+        "pseudonym": f"{X500ATTR_OID}65",
+        "dnQualifier": f"{X500ATTR_OID}46",
+        "crossCertificatePair": f"{X500ATTR_OID}40",
+        "eduPersonOrgDN": f"{EDUPERSON_OID}3",
+        "authorityRevocationList": f"{X500ATTR_OID}38",
+        "displayName": f"{NETSCAPE_LDAP}241",
+        "businessCategory": f"{X500ATTR_OID}15",
+        "serialNumber": f"{X500ATTR_OID}5",
+        "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7",
+        "st": f"{X500ATTR_OID}8",
+        "carLicense": f"{NETSCAPE_LDAP}1",
+        "presentationAddress": f"{X500ATTR_OID}29",
+        "sn": f"{X500ATTR_OID}4",
+        "domainComponent": f"{UCL_DIR_PILOT}25",
+        "labeledURI": f"{UMICH}57",
+        "uid": f"{UCL_DIR_PILOT}1",
     },
 }
diff --git a/example/attributemaps/shibboleth_uri.py b/example/attributemaps/shibboleth_uri.py
index 30b31503..992a2219 100644
--- a/example/attributemaps/shibboleth_uri.py
+++ b/example/attributemaps/shibboleth_uri.py
@@ -9,182 +9,182 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57."
 MAP = {
     "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri",
     "fro": {
-        EDUPERSON_OID + "2": "eduPersonNickname",
-        EDUPERSON_OID + "9": "eduPersonScopedAffiliation",
-        EDUPERSON_OID + "11": "eduPersonAssurance",
-        EDUPERSON_OID + "10": "eduPersonTargetedID",
-        EDUPERSON_OID + "4": "eduPersonOrgUnitDN",
-        NOREDUPERSON_OID + "6": "norEduOrgAcronym",
-        NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier",
-        NOREDUPERSON_OID + "4": "norEduPersonLIN",
-        EDUPERSON_OID + "1": "eduPersonAffiliation",
-        NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber",
-        NETSCAPE_LDAP + "40": "userSMIMECertificate",
-        NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber",
-        NETSCAPE_LDAP + "241": "displayName",
-        UCL_DIR_PILOT + "37": "associatedDomain",
-        EDUPERSON_OID + "6": "eduPersonPrincipalName",
-        NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier",
-        NOREDUPERSON_OID + "9": "federationFeideSchemaVersion",
-        X500ATTR + "53": "deltaRevocationList",
-        X500ATTR + "52": "supportedAlgorithms",
-        X500ATTR + "51": "houseIdentifier",
-        X500ATTR + "50": "uniqueMember",
-        X500ATTR + "19": "physicalDeliveryOfficeName",
-        X500ATTR + "18": "postOfficeBox",
-        X500ATTR + "17": "postalCode",
-        X500ATTR + "16": "postalAddress",
-        X500ATTR + "15": "businessCategory",
-        X500ATTR + "14": "searchGuide",
-        EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation",
-        X500ATTR + "12": "title",
-        X500ATTR + "11": "ou",
-        X500ATTR + "10": "o",
-        X500ATTR + "37": "cACertificate",
-        X500ATTR + "36": "userCertificate",
-        X500ATTR + "31": "member",
-        X500ATTR + "30": "supportedApplicationContext",
-        X500ATTR + "33": "roleOccupant",
-        X500ATTR + "32": "owner",
-        NETSCAPE_LDAP + "1": "carLicense",
-        PKCS_9 + "1": "email",
-        NETSCAPE_LDAP + "3": "employeeNumber",
-        NETSCAPE_LDAP + "2": "departmentNumber",
-        X500ATTR + "39": "certificateRevocationList",
-        X500ATTR + "38": "authorityRevocationList",
-        NETSCAPE_LDAP + "216": "userPKCS12",
-        EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN",
-        X500ATTR + "9": "street",
-        X500ATTR + "8": "st",
-        NETSCAPE_LDAP + "39": "preferredLanguage",
-        EDUPERSON_OID + "7": "eduPersonEntitlement",
-        X500ATTR + "2": "knowledgeInformation",
-        X500ATTR + "7": "l",
-        X500ATTR + "6": "c",
-        X500ATTR + "5": "serialNumber",
-        X500ATTR + "4": "sn",
-        UCL_DIR_PILOT + "60": "jpegPhoto",
-        X500ATTR + "65": "pseudonym",
-        NOREDUPERSON_OID + "5": "norEduPersonNIN",
-        UCL_DIR_PILOT + "3": "mail",
-        UCL_DIR_PILOT + "25": "dc",
-        X500ATTR + "40": "crossCertificatePair",
-        X500ATTR + "42": "givenName",
-        X500ATTR + "43": "initials",
-        X500ATTR + "44": "generationQualifier",
-        X500ATTR + "45": "x500UniqueIdentifier",
-        X500ATTR + "46": "dnQualifier",
-        X500ATTR + "47": "enhancedSearchGuide",
-        X500ATTR + "48": "protocolInformation",
-        X500ATTR + "54": "dmdName",
-        NETSCAPE_LDAP + "4": "employeeType",
-        X500ATTR + "22": "teletexTerminalIdentifier",
-        X500ATTR + "23": "facsimileTelephoneNumber",
-        X500ATTR + "20": "telephoneNumber",
-        X500ATTR + "21": "telexNumber",
-        X500ATTR + "26": "registeredAddress",
-        X500ATTR + "27": "destinationIndicator",
-        X500ATTR + "24": "x121Address",
-        X500ATTR + "25": "internationaliSDNNumber",
-        X500ATTR + "28": "preferredDeliveryMethod",
-        X500ATTR + "29": "presentationAddress",
-        EDUPERSON_OID + "3": "eduPersonOrgDN",
-        NOREDUPERSON_OID + "3": "norEduPersonBirthDate",
+        f"{EDUPERSON_OID}2": "eduPersonNickname",
+        f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation",
+        f"{EDUPERSON_OID}11": "eduPersonAssurance",
+        f"{EDUPERSON_OID}10": "eduPersonTargetedID",
+        f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN",
+        f"{NOREDUPERSON_OID}6": "norEduOrgAcronym",
+        f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier",
+        f"{NOREDUPERSON_OID}4": "norEduPersonLIN",
+        f"{EDUPERSON_OID}1": "eduPersonAffiliation",
+        f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber",
+        f"{NETSCAPE_LDAP}40": "userSMIMECertificate",
+        f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber",
+        f"{NETSCAPE_LDAP}241": "displayName",
+        f"{UCL_DIR_PILOT}37": "associatedDomain",
+        f"{EDUPERSON_OID}6": "eduPersonPrincipalName",
+        f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier",
+        f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion",
+        f"{X500ATTR}53": "deltaRevocationList",
+        f"{X500ATTR}52": "supportedAlgorithms",
+        f"{X500ATTR}51": "houseIdentifier",
+        f"{X500ATTR}50": "uniqueMember",
+        f"{X500ATTR}19": "physicalDeliveryOfficeName",
+        f"{X500ATTR}18": "postOfficeBox",
+        f"{X500ATTR}17": "postalCode",
+        f"{X500ATTR}16": "postalAddress",
+        f"{X500ATTR}15": "businessCategory",
+        f"{X500ATTR}14": "searchGuide",
+        f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation",
+        f"{X500ATTR}12": "title",
+        f"{X500ATTR}11": "ou",
+        f"{X500ATTR}10": "o",
+        f"{X500ATTR}37": "cACertificate",
+        f"{X500ATTR}36": "userCertificate",
+        f"{X500ATTR}31": "member",
+        f"{X500ATTR}30": "supportedApplicationContext",
+        f"{X500ATTR}33": "roleOccupant",
+        f"{X500ATTR}32": "owner",
+        f"{NETSCAPE_LDAP}1": "carLicense",
+        f"{PKCS_9}1": "email",
+        f"{NETSCAPE_LDAP}3": "employeeNumber",
+        f"{NETSCAPE_LDAP}2": "departmentNumber",
+        f"{X500ATTR}39": "certificateRevocationList",
+        f"{X500ATTR}38": "authorityRevocationList",
+        f"{NETSCAPE_LDAP}216": "userPKCS12",
+        f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN",
+        f"{X500ATTR}9": "street",
+        f"{X500ATTR}8": "st",
+        f"{NETSCAPE_LDAP}39": "preferredLanguage",
+        f"{EDUPERSON_OID}7": "eduPersonEntitlement",
+        f"{X500ATTR}2": "knowledgeInformation",
+        f"{X500ATTR}7": "l",
+        f"{X500ATTR}6": "c",
+        f"{X500ATTR}5": "serialNumber",
+        f"{X500ATTR}4": "sn",
+        f"{UCL_DIR_PILOT}60": "jpegPhoto",
+        f"{X500ATTR}65": "pseudonym",
+        f"{NOREDUPERSON_OID}5": "norEduPersonNIN",
+        f"{UCL_DIR_PILOT}3": "mail",
+        f"{UCL_DIR_PILOT}25": "dc",
+        f"{X500ATTR}40": "crossCertificatePair",
+        f"{X500ATTR}42": "givenName",
+        f"{X500ATTR}43": "initials",
+        f"{X500ATTR}44": "generationQualifier",
+        f"{X500ATTR}45": "x500UniqueIdentifier",
+        f"{X500ATTR}46": "dnQualifier",
+        f"{X500ATTR}47": "enhancedSearchGuide",
+        f"{X500ATTR}48": "protocolInformation",
+        f"{X500ATTR}54": "dmdName",
+        f"{NETSCAPE_LDAP}4": "employeeType",
+        f"{X500ATTR}22": "teletexTerminalIdentifier",
+        f"{X500ATTR}23": "facsimileTelephoneNumber",
+        f"{X500ATTR}20": "telephoneNumber",
+        f"{X500ATTR}21": "telexNumber",
+        f"{X500ATTR}26": "registeredAddress",
+        f"{X500ATTR}27": "destinationIndicator",
+        f"{X500ATTR}24": "x121Address",
+        f"{X500ATTR}25": "internationaliSDNNumber",
+        f"{X500ATTR}28": "preferredDeliveryMethod",
+        f"{X500ATTR}29": "presentationAddress",
+        f"{EDUPERSON_OID}3": "eduPersonOrgDN",
+        f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate",
     },
     "to": {
-        "roleOccupant": X500ATTR + "33",
-        "gn": X500ATTR + "42",
-        "norEduPersonNIN": NOREDUPERSON_OID + "5",
-        "title": X500ATTR + "12",
-        "facsimileTelephoneNumber": X500ATTR + "23",
-        "mail": UCL_DIR_PILOT + "3",
-        "postOfficeBox": X500ATTR + "18",
-        "fax": X500ATTR + "23",
-        "telephoneNumber": X500ATTR + "20",
-        "norEduPersonBirthDate": NOREDUPERSON_OID + "3",
-        "rfc822Mailbox": UCL_DIR_PILOT + "3",
-        "dc": UCL_DIR_PILOT + "25",
-        "countryName": X500ATTR + "6",
-        "emailAddress": PKCS_9 + "1",
-        "employeeNumber": NETSCAPE_LDAP + "3",
-        "organizationName": X500ATTR + "10",
-        "eduPersonAssurance": EDUPERSON_OID + "11",
-        "norEduOrgAcronym": NOREDUPERSON_OID + "6",
-        "registeredAddress": X500ATTR + "26",
-        "physicalDeliveryOfficeName": X500ATTR + "19",
-        "associatedDomain": UCL_DIR_PILOT + "37",
-        "l": X500ATTR + "7",
-        "stateOrProvinceName": X500ATTR + "8",
-        "federationFeideSchemaVersion": NOREDUPERSON_OID + "9",
-        "pkcs9email": PKCS_9 + "1",
-        "givenName": X500ATTR + "42",
-        "x500UniqueIdentifier": X500ATTR + "45",
-        "eduPersonNickname": EDUPERSON_OID + "2",
-        "houseIdentifier": X500ATTR + "51",
-        "street": X500ATTR + "9",
-        "supportedAlgorithms": X500ATTR + "52",
-        "preferredLanguage": NETSCAPE_LDAP + "39",
-        "postalAddress": X500ATTR + "16",
-        "email": PKCS_9 + "1",
-        "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8",
-        "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8",
-        "c": X500ATTR + "6",
-        "teletexTerminalIdentifier": X500ATTR + "22",
-        "o": X500ATTR + "10",
-        "cACertificate": X500ATTR + "37",
-        "telexNumber": X500ATTR + "21",
-        "ou": X500ATTR + "11",
-        "initials": X500ATTR + "43",
-        "eduPersonOrgUnitDN": EDUPERSON_OID + "4",
-        "deltaRevocationList": X500ATTR + "53",
-        "norEduPersonLIN": NOREDUPERSON_OID + "4",
-        "supportedApplicationContext": X500ATTR + "30",
-        "eduPersonEntitlement": EDUPERSON_OID + "7",
-        "generationQualifier": X500ATTR + "44",
-        "eduPersonAffiliation": EDUPERSON_OID + "1",
-        "eduPersonPrincipalName": EDUPERSON_OID + "6",
-        "localityName": X500ATTR + "7",
-        "owner": X500ATTR + "32",
-        "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2",
-        "searchGuide": X500ATTR + "14",
-        "certificateRevocationList": X500ATTR + "39",
-        "organizationalUnitName": X500ATTR + "11",
-        "userCertificate": X500ATTR + "36",
-        "preferredDeliveryMethod": X500ATTR + "28",
-        "internationaliSDNNumber": X500ATTR + "25",
-        "uniqueMember": X500ATTR + "50",
-        "departmentNumber": NETSCAPE_LDAP + "2",
-        "enhancedSearchGuide": X500ATTR + "47",
-        "userPKCS12": NETSCAPE_LDAP + "216",
-        "eduPersonTargetedID": EDUPERSON_OID + "10",
-        "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1",
-        "x121Address": X500ATTR + "24",
-        "destinationIndicator": X500ATTR + "27",
-        "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5",
-        "surname": X500ATTR + "4",
-        "jpegPhoto": UCL_DIR_PILOT + "60",
-        "eduPersonScopedAffiliation": EDUPERSON_OID + "9",
-        "protocolInformation": X500ATTR + "48",
-        "knowledgeInformation": X500ATTR + "2",
-        "employeeType": NETSCAPE_LDAP + "4",
-        "userSMIMECertificate": NETSCAPE_LDAP + "40",
-        "member": X500ATTR + "31",
-        "streetAddress": X500ATTR + "9",
-        "dmdName": X500ATTR + "54",
-        "postalCode": X500ATTR + "17",
-        "pseudonym": X500ATTR + "65",
-        "dnQualifier": X500ATTR + "46",
-        "crossCertificatePair": X500ATTR + "40",
-        "eduPersonOrgDN": EDUPERSON_OID + "3",
-        "authorityRevocationList": X500ATTR + "38",
-        "displayName": NETSCAPE_LDAP + "241",
-        "businessCategory": X500ATTR + "15",
-        "serialNumber": X500ATTR + "5",
-        "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7",
-        "st": X500ATTR + "8",
-        "carLicense": NETSCAPE_LDAP + "1",
-        "presentationAddress": X500ATTR + "29",
-        "sn": X500ATTR + "4",
-        "domainComponent": UCL_DIR_PILOT + "25",
+        "roleOccupant": f"{X500ATTR}33",
+        "gn": f"{X500ATTR}42",
+        "norEduPersonNIN": f"{NOREDUPERSON_OID}5",
+        "title": f"{X500ATTR}12",
+        "facsimileTelephoneNumber": f"{X500ATTR}23",
+        "mail": f"{UCL_DIR_PILOT}3",
+        "postOfficeBox": f"{X500ATTR}18",
+        "fax": f"{X500ATTR}23",
+        "telephoneNumber": f"{X500ATTR}20",
+        "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3",
+        "rfc822Mailbox": f"{UCL_DIR_PILOT}3",
+        "dc": f"{UCL_DIR_PILOT}25",
+        "countryName": f"{X500ATTR}6",
+        "emailAddress": f"{PKCS_9}1",
+        "employeeNumber": f"{NETSCAPE_LDAP}3",
+        "organizationName": f"{X500ATTR}10",
+        "eduPersonAssurance": f"{EDUPERSON_OID}11",
+        "norEduOrgAcronym": f"{NOREDUPERSON_OID}6",
+        "registeredAddress": f"{X500ATTR}26",
+        "physicalDeliveryOfficeName": f"{X500ATTR}19",
+        "associatedDomain": f"{UCL_DIR_PILOT}37",
+        "l": f"{X500ATTR}7",
+        "stateOrProvinceName": f"{X500ATTR}8",
+        "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9",
+        "pkcs9email": f"{PKCS_9}1",
+        "givenName": f"{X500ATTR}42",
+        "x500UniqueIdentifier": f"{X500ATTR}45",
+        "eduPersonNickname": f"{EDUPERSON_OID}2",
+        "houseIdentifier": f"{X500ATTR}51",
+        "street": f"{X500ATTR}9",
+        "supportedAlgorithms": f"{X500ATTR}52",
+        "preferredLanguage": f"{NETSCAPE_LDAP}39",
+        "postalAddress": f"{X500ATTR}16",
+        "email": f"{PKCS_9}1",
+        "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8",
+        "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8",
+        "c": f"{X500ATTR}6",
+        "teletexTerminalIdentifier": f"{X500ATTR}22",
+        "o": f"{X500ATTR}10",
+        "cACertificate": f"{X500ATTR}37",
+        "telexNumber": f"{X500ATTR}21",
+        "ou": f"{X500ATTR}11",
+        "initials": f"{X500ATTR}43",
+        "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4",
+        "deltaRevocationList": f"{X500ATTR}53",
+        "norEduPersonLIN": f"{NOREDUPERSON_OID}4",
+        "supportedApplicationContext": f"{X500ATTR}30",
+        "eduPersonEntitlement": f"{EDUPERSON_OID}7",
+        "generationQualifier": f"{X500ATTR}44",
+        "eduPersonAffiliation": f"{EDUPERSON_OID}1",
+        "eduPersonPrincipalName": f"{EDUPERSON_OID}6",
+        "localityName": f"{X500ATTR}7",
+        "owner": f"{X500ATTR}32",
+        "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2",
+        "searchGuide": f"{X500ATTR}14",
+        "certificateRevocationList": f"{X500ATTR}39",
+        "organizationalUnitName": f"{X500ATTR}11",
+        "userCertificate": f"{X500ATTR}36",
+        "preferredDeliveryMethod": f"{X500ATTR}28",
+        "internationaliSDNNumber": f"{X500ATTR}25",
+        "uniqueMember": f"{X500ATTR}50",
+        "departmentNumber": f"{NETSCAPE_LDAP}2",
+        "enhancedSearchGuide": f"{X500ATTR}47",
+        "userPKCS12": f"{NETSCAPE_LDAP}216",
+        "eduPersonTargetedID": f"{EDUPERSON_OID}10",
+        "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1",
+        "x121Address": f"{X500ATTR}24",
+        "destinationIndicator": f"{X500ATTR}27",
+        "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5",
+        "surname": f"{X500ATTR}4",
+        "jpegPhoto": f"{UCL_DIR_PILOT}60",
+        "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9",
+        "protocolInformation": f"{X500ATTR}48",
+        "knowledgeInformation": f"{X500ATTR}2",
+        "employeeType": f"{NETSCAPE_LDAP}4",
+        "userSMIMECertificate": f"{NETSCAPE_LDAP}40",
+        "member": f"{X500ATTR}31",
+        "streetAddress": f"{X500ATTR}9",
+        "dmdName": f"{X500ATTR}54",
+        "postalCode": f"{X500ATTR}17",
+        "pseudonym": f"{X500ATTR}65",
+        "dnQualifier": f"{X500ATTR}46",
+        "crossCertificatePair": f"{X500ATTR}40",
+        "eduPersonOrgDN": f"{EDUPERSON_OID}3",
+        "authorityRevocationList": f"{X500ATTR}38",
+        "displayName": f"{NETSCAPE_LDAP}241",
+        "businessCategory": f"{X500ATTR}15",
+        "serialNumber": f"{X500ATTR}5",
+        "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7",
+        "st": f"{X500ATTR}8",
+        "carLicense": f"{NETSCAPE_LDAP}1",
+        "presentationAddress": f"{X500ATTR}29",
+        "sn": f"{X500ATTR}4",
+        "domainComponent": f"{UCL_DIR_PILOT}25",
     },
 }
diff --git a/example/idp2/idp.py b/example/idp2/idp.py
index 6bd85a5e..17013646 100755
--- a/example/idp2/idp.py
+++ b/example/idp2/idp.py
@@ -1078,8 +1078,8 @@ if __name__ == "__main__":
 
     _rot = args.mako_root
     LOOKUP = TemplateLookup(
-        directories=[_rot + "templates", _rot + "htdocs"],
-        module_directory=_rot + "modules",
+        directories=[f"{_rot}templates", f"{_rot}htdocs"],
+        module_directory=f"{_rot}modules",
         input_encoding="utf-8",
         output_encoding="utf-8",
     )
diff --git a/example/idp2/idp_uwsgi.py b/example/idp2/idp_uwsgi.py
index ab14e0ec..af559d51 100755
--- a/example/idp2/idp_uwsgi.py
+++ b/example/idp2/idp_uwsgi.py
@@ -975,8 +975,8 @@ if __name__ == "__main__":
 
     _rot = args.mako_root
     LOOKUP = TemplateLookup(
-        directories=[_rot + "templates", _rot + "htdocs"],
-        module_directory=_rot + "modules",
+        directories=[f"{_rot}templates", f"{_rot}htdocs"],
+        module_directory=f"{_rot}modules",
         input_encoding="utf-8",
         output_encoding="utf-8",
     )
@@ -990,8 +990,8 @@ if __name__ == "__main__":
 else:
     _rot = args.mako_root
     LOOKUP = TemplateLookup(
-        directories=[_rot + "templates", _rot + "htdocs"],
-        module_directory=_rot + "modules",
+        directories=[f"{_rot}templates", f"{_rot}htdocs"],
+        module_directory=f"{_rot}modules",
         input_encoding="utf-8",
         output_encoding="utf-8",
     )
diff --git a/example/idp2_repoze/idp.py b/example/idp2_repoze/idp.py
index d42f8262..cc36e9ec 100755
--- a/example/idp2_repoze/idp.py
+++ b/example/idp2_repoze/idp.py
@@ -962,8 +962,8 @@ if __name__ == "__main__":
 
     _rot = args.mako_root
     LOOKUP = TemplateLookup(
-        directories=[_rot + "templates", _rot + "htdocs"],
-        module_directory=_rot + "modules",
+        directories=[f"{_rot}templates", f"{_rot}htdocs"],
+        module_directory=f"{_rot}modules",
         input_encoding="utf-8",
         output_encoding="utf-8",
     )
@@ -977,8 +977,8 @@ if __name__ == "__main__":
 else:
     _rot = args.mako_root
     LOOKUP = TemplateLookup(
-        directories=[_rot + "templates", _rot + "htdocs"],
-        module_directory=_rot + "modules",
+        directories=[f"{_rot}templates", f"{_rot}htdocs"],
+        module_directory=f"{_rot}modules",
         input_encoding="utf-8",
         output_encoding="utf-8",
     )
diff --git a/example/sp-repoze/attributemaps/saml_uri.py b/example/sp-repoze/attributemaps/saml_uri.py
index 245d05ed..a6672559 100644
--- a/example/sp-repoze/attributemaps/saml_uri.py
+++ b/example/sp-repoze/attributemaps/saml_uri.py
@@ -11,189 +11,189 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57."
 MAP = {
     "identifier": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
     "fro": {
-        EDUPERSON_OID + "2": "eduPersonNickname",
-        EDUPERSON_OID + "9": "eduPersonScopedAffiliation",
-        EDUPERSON_OID + "11": "eduPersonAssurance",
-        EDUPERSON_OID + "10": "eduPersonTargetedID",
-        EDUPERSON_OID + "4": "eduPersonOrgUnitDN",
-        NOREDUPERSON_OID + "6": "norEduOrgAcronym",
-        NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier",
-        NOREDUPERSON_OID + "4": "norEduPersonLIN",
-        EDUPERSON_OID + "1": "eduPersonAffiliation",
-        NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber",
-        NETSCAPE_LDAP + "40": "userSMIMECertificate",
-        NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber",
-        NETSCAPE_LDAP + "241": "displayName",
-        UCL_DIR_PILOT + "37": "associatedDomain",
-        EDUPERSON_OID + "6": "eduPersonPrincipalName",
-        NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier",
-        NOREDUPERSON_OID + "9": "federationFeideSchemaVersion",
-        X500ATTR_OID + "53": "deltaRevocationList",
-        X500ATTR_OID + "52": "supportedAlgorithms",
-        X500ATTR_OID + "51": "houseIdentifier",
-        X500ATTR_OID + "50": "uniqueMember",
-        X500ATTR_OID + "19": "physicalDeliveryOfficeName",
-        X500ATTR_OID + "18": "postOfficeBox",
-        X500ATTR_OID + "17": "postalCode",
-        X500ATTR_OID + "16": "postalAddress",
-        X500ATTR_OID + "15": "businessCategory",
-        X500ATTR_OID + "14": "searchGuide",
-        EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation",
-        X500ATTR_OID + "12": "title",
-        X500ATTR_OID + "11": "ou",
-        X500ATTR_OID + "10": "o",
-        X500ATTR_OID + "37": "cACertificate",
-        X500ATTR_OID + "36": "userCertificate",
-        X500ATTR_OID + "31": "member",
-        X500ATTR_OID + "30": "supportedApplicationContext",
-        X500ATTR_OID + "33": "roleOccupant",
-        X500ATTR_OID + "32": "owner",
-        NETSCAPE_LDAP + "1": "carLicense",
-        PKCS_9 + "1": "email",
-        NETSCAPE_LDAP + "3": "employeeNumber",
-        NETSCAPE_LDAP + "2": "departmentNumber",
-        X500ATTR_OID + "39": "certificateRevocationList",
-        X500ATTR_OID + "38": "authorityRevocationList",
-        NETSCAPE_LDAP + "216": "userPKCS12",
-        EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN",
-        X500ATTR_OID + "9": "street",
-        X500ATTR_OID + "8": "st",
-        NETSCAPE_LDAP + "39": "preferredLanguage",
-        EDUPERSON_OID + "7": "eduPersonEntitlement",
-        X500ATTR_OID + "2": "knowledgeInformation",
-        X500ATTR_OID + "7": "l",
-        X500ATTR_OID + "6": "c",
-        X500ATTR_OID + "5": "serialNumber",
-        X500ATTR_OID + "4": "sn",
-        UCL_DIR_PILOT + "60": "jpegPhoto",
-        X500ATTR_OID + "65": "pseudonym",
-        NOREDUPERSON_OID + "5": "norEduPersonNIN",
-        UCL_DIR_PILOT + "3": "mail",
-        UCL_DIR_PILOT + "25": "dc",
-        X500ATTR_OID + "40": "crossCertificatePair",
-        X500ATTR_OID + "42": "givenName",
-        X500ATTR_OID + "43": "initials",
-        X500ATTR_OID + "44": "generationQualifier",
-        X500ATTR_OID + "45": "x500UniqueIdentifier",
-        X500ATTR_OID + "46": "dnQualifier",
-        X500ATTR_OID + "47": "enhancedSearchGuide",
-        X500ATTR_OID + "48": "protocolInformation",
-        X500ATTR_OID + "54": "dmdName",
-        NETSCAPE_LDAP + "4": "employeeType",
-        X500ATTR_OID + "22": "teletexTerminalIdentifier",
-        X500ATTR_OID + "23": "facsimileTelephoneNumber",
-        X500ATTR_OID + "20": "telephoneNumber",
-        X500ATTR_OID + "21": "telexNumber",
-        X500ATTR_OID + "26": "registeredAddress",
-        X500ATTR_OID + "27": "destinationIndicator",
-        X500ATTR_OID + "24": "x121Address",
-        X500ATTR_OID + "25": "internationaliSDNNumber",
-        X500ATTR_OID + "28": "preferredDeliveryMethod",
-        X500ATTR_OID + "29": "presentationAddress",
-        EDUPERSON_OID + "3": "eduPersonOrgDN",
-        NOREDUPERSON_OID + "3": "norEduPersonBirthDate",
-        UMICH + "57": "labeledURI",
-        UCL_DIR_PILOT + "1": "uid",
+        f"{EDUPERSON_OID}2": "eduPersonNickname",
+        f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation",
+        f"{EDUPERSON_OID}11": "eduPersonAssurance",
+        f"{EDUPERSON_OID}10": "eduPersonTargetedID",
+        f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN",
+        f"{NOREDUPERSON_OID}6": "norEduOrgAcronym",
+        f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier",
+        f"{NOREDUPERSON_OID}4": "norEduPersonLIN",
+        f"{EDUPERSON_OID}1": "eduPersonAffiliation",
+        f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber",
+        f"{NETSCAPE_LDAP}40": "userSMIMECertificate",
+        f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber",
+        f"{NETSCAPE_LDAP}241": "displayName",
+        f"{UCL_DIR_PILOT}37": "associatedDomain",
+        f"{EDUPERSON_OID}6": "eduPersonPrincipalName",
+        f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier",
+        f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion",
+        f"{X500ATTR_OID}53": "deltaRevocationList",
+        f"{X500ATTR_OID}52": "supportedAlgorithms",
+        f"{X500ATTR_OID}51": "houseIdentifier",
+        f"{X500ATTR_OID}50": "uniqueMember",
+        f"{X500ATTR_OID}19": "physicalDeliveryOfficeName",
+        f"{X500ATTR_OID}18": "postOfficeBox",
+        f"{X500ATTR_OID}17": "postalCode",
+        f"{X500ATTR_OID}16": "postalAddress",
+        f"{X500ATTR_OID}15": "businessCategory",
+        f"{X500ATTR_OID}14": "searchGuide",
+        f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation",
+        f"{X500ATTR_OID}12": "title",
+        f"{X500ATTR_OID}11": "ou",
+        f"{X500ATTR_OID}10": "o",
+        f"{X500ATTR_OID}37": "cACertificate",
+        f"{X500ATTR_OID}36": "userCertificate",
+        f"{X500ATTR_OID}31": "member",
+        f"{X500ATTR_OID}30": "supportedApplicationContext",
+        f"{X500ATTR_OID}33": "roleOccupant",
+        f"{X500ATTR_OID}32": "owner",
+        f"{NETSCAPE_LDAP}1": "carLicense",
+        f"{PKCS_9}1": "email",
+        f"{NETSCAPE_LDAP}3": "employeeNumber",
+        f"{NETSCAPE_LDAP}2": "departmentNumber",
+        f"{X500ATTR_OID}39": "certificateRevocationList",
+        f"{X500ATTR_OID}38": "authorityRevocationList",
+        f"{NETSCAPE_LDAP}216": "userPKCS12",
+        f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN",
+        f"{X500ATTR_OID}9": "street",
+        f"{X500ATTR_OID}8": "st",
+        f"{NETSCAPE_LDAP}39": "preferredLanguage",
+        f"{EDUPERSON_OID}7": "eduPersonEntitlement",
+        f"{X500ATTR_OID}2": "knowledgeInformation",
+        f"{X500ATTR_OID}7": "l",
+        f"{X500ATTR_OID}6": "c",
+        f"{X500ATTR_OID}5": "serialNumber",
+        f"{X500ATTR_OID}4": "sn",
+        f"{UCL_DIR_PILOT}60": "jpegPhoto",
+        f"{X500ATTR_OID}65": "pseudonym",
+        f"{NOREDUPERSON_OID}5": "norEduPersonNIN",
+        f"{UCL_DIR_PILOT}3": "mail",
+        f"{UCL_DIR_PILOT}25": "dc",
+        f"{X500ATTR_OID}40": "crossCertificatePair",
+        f"{X500ATTR_OID}42": "givenName",
+        f"{X500ATTR_OID}43": "initials",
+        f"{X500ATTR_OID}44": "generationQualifier",
+        f"{X500ATTR_OID}45": "x500UniqueIdentifier",
+        f"{X500ATTR_OID}46": "dnQualifier",
+        f"{X500ATTR_OID}47": "enhancedSearchGuide",
+        f"{X500ATTR_OID}48": "protocolInformation",
+        f"{X500ATTR_OID}54": "dmdName",
+        f"{NETSCAPE_LDAP}4": "employeeType",
+        f"{X500ATTR_OID}22": "teletexTerminalIdentifier",
+        f"{X500ATTR_OID}23": "facsimileTelephoneNumber",
+        f"{X500ATTR_OID}20": "telephoneNumber",
+        f"{X500ATTR_OID}21": "telexNumber",
+        f"{X500ATTR_OID}26": "registeredAddress",
+        f"{X500ATTR_OID}27": "destinationIndicator",
+        f"{X500ATTR_OID}24": "x121Address",
+        f"{X500ATTR_OID}25": "internationaliSDNNumber",
+        f"{X500ATTR_OID}28": "preferredDeliveryMethod",
+        f"{X500ATTR_OID}29": "presentationAddress",
+        f"{EDUPERSON_OID}3": "eduPersonOrgDN",
+        f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate",
+        f"{UMICH}57": "labeledURI",
+        f"{UCL_DIR_PILOT}1": "uid",
     },
     "to": {
-        "roleOccupant": X500ATTR_OID + "33",
-        "gn": X500ATTR_OID + "42",
-        "norEduPersonNIN": NOREDUPERSON_OID + "5",
-        "title": X500ATTR_OID + "12",
-        "facsimileTelephoneNumber": X500ATTR_OID + "23",
-        "mail": UCL_DIR_PILOT + "3",
-        "postOfficeBox": X500ATTR_OID + "18",
-        "fax": X500ATTR_OID + "23",
-        "telephoneNumber": X500ATTR_OID + "20",
-        "norEduPersonBirthDate": NOREDUPERSON_OID + "3",
-        "rfc822Mailbox": UCL_DIR_PILOT + "3",
-        "dc": UCL_DIR_PILOT + "25",
-        "countryName": X500ATTR_OID + "6",
-        "emailAddress": PKCS_9 + "1",
-        "employeeNumber": NETSCAPE_LDAP + "3",
-        "organizationName": X500ATTR_OID + "10",
-        "eduPersonAssurance": EDUPERSON_OID + "11",
-        "norEduOrgAcronym": NOREDUPERSON_OID + "6",
-        "registeredAddress": X500ATTR_OID + "26",
-        "physicalDeliveryOfficeName": X500ATTR_OID + "19",
-        "associatedDomain": UCL_DIR_PILOT + "37",
-        "l": X500ATTR_OID + "7",
-        "stateOrProvinceName": X500ATTR_OID + "8",
-        "federationFeideSchemaVersion": NOREDUPERSON_OID + "9",
-        "pkcs9email": PKCS_9 + "1",
-        "givenName": X500ATTR_OID + "42",
-        "givenname": X500ATTR_OID + "42",
-        "x500UniqueIdentifier": X500ATTR_OID + "45",
-        "eduPersonNickname": EDUPERSON_OID + "2",
-        "houseIdentifier": X500ATTR_OID + "51",
-        "street": X500ATTR_OID + "9",
-        "supportedAlgorithms": X500ATTR_OID + "52",
-        "preferredLanguage": NETSCAPE_LDAP + "39",
-        "postalAddress": X500ATTR_OID + "16",
-        "email": PKCS_9 + "1",
-        "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8",
-        "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8",
-        "c": X500ATTR_OID + "6",
-        "teletexTerminalIdentifier": X500ATTR_OID + "22",
-        "o": X500ATTR_OID + "10",
-        "cACertificate": X500ATTR_OID + "37",
-        "telexNumber": X500ATTR_OID + "21",
-        "ou": X500ATTR_OID + "11",
-        "initials": X500ATTR_OID + "43",
-        "eduPersonOrgUnitDN": EDUPERSON_OID + "4",
-        "deltaRevocationList": X500ATTR_OID + "53",
-        "norEduPersonLIN": NOREDUPERSON_OID + "4",
-        "supportedApplicationContext": X500ATTR_OID + "30",
-        "eduPersonEntitlement": EDUPERSON_OID + "7",
-        "generationQualifier": X500ATTR_OID + "44",
-        "eduPersonAffiliation": EDUPERSON_OID + "1",
-        "eduPersonPrincipalName": EDUPERSON_OID + "6",
-        "edupersonprincipalname": EDUPERSON_OID + "6",
-        "localityName": X500ATTR_OID + "7",
-        "owner": X500ATTR_OID + "32",
-        "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2",
-        "searchGuide": X500ATTR_OID + "14",
-        "certificateRevocationList": X500ATTR_OID + "39",
-        "organizationalUnitName": X500ATTR_OID + "11",
-        "userCertificate": X500ATTR_OID + "36",
-        "preferredDeliveryMethod": X500ATTR_OID + "28",
-        "internationaliSDNNumber": X500ATTR_OID + "25",
-        "uniqueMember": X500ATTR_OID + "50",
-        "departmentNumber": NETSCAPE_LDAP + "2",
-        "enhancedSearchGuide": X500ATTR_OID + "47",
-        "userPKCS12": NETSCAPE_LDAP + "216",
-        "eduPersonTargetedID": EDUPERSON_OID + "10",
-        "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1",
-        "x121Address": X500ATTR_OID + "24",
-        "destinationIndicator": X500ATTR_OID + "27",
-        "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5",
-        "surname": X500ATTR_OID + "4",
-        "jpegPhoto": UCL_DIR_PILOT + "60",
-        "eduPersonScopedAffiliation": EDUPERSON_OID + "9",
-        "edupersonscopedaffiliation": EDUPERSON_OID + "9",
-        "protocolInformation": X500ATTR_OID + "48",
-        "knowledgeInformation": X500ATTR_OID + "2",
-        "employeeType": NETSCAPE_LDAP + "4",
-        "userSMIMECertificate": NETSCAPE_LDAP + "40",
-        "member": X500ATTR_OID + "31",
-        "streetAddress": X500ATTR_OID + "9",
-        "dmdName": X500ATTR_OID + "54",
-        "postalCode": X500ATTR_OID + "17",
-        "pseudonym": X500ATTR_OID + "65",
-        "dnQualifier": X500ATTR_OID + "46",
-        "crossCertificatePair": X500ATTR_OID + "40",
-        "eduPersonOrgDN": EDUPERSON_OID + "3",
-        "authorityRevocationList": X500ATTR_OID + "38",
-        "displayName": NETSCAPE_LDAP + "241",
-        "businessCategory": X500ATTR_OID + "15",
-        "serialNumber": X500ATTR_OID + "5",
-        "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7",
-        "st": X500ATTR_OID + "8",
-        "carLicense": NETSCAPE_LDAP + "1",
-        "presentationAddress": X500ATTR_OID + "29",
-        "sn": X500ATTR_OID + "4",
-        "domainComponent": UCL_DIR_PILOT + "25",
-        "labeledURI": UMICH + "57",
-        "uid": UCL_DIR_PILOT + "1",
+        "roleOccupant": f"{X500ATTR_OID}33",
+        "gn": f"{X500ATTR_OID}42",
+        "norEduPersonNIN": f"{NOREDUPERSON_OID}5",
+        "title": f"{X500ATTR_OID}12",
+        "facsimileTelephoneNumber": f"{X500ATTR_OID}23",
+        "mail": f"{UCL_DIR_PILOT}3",
+        "postOfficeBox": f"{X500ATTR_OID}18",
+        "fax": f"{X500ATTR_OID}23",
+        "telephoneNumber": f"{X500ATTR_OID}20",
+        "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3",
+        "rfc822Mailbox": f"{UCL_DIR_PILOT}3",
+        "dc": f"{UCL_DIR_PILOT}25",
+        "countryName": f"{X500ATTR_OID}6",
+        "emailAddress": f"{PKCS_9}1",
+        "employeeNumber": f"{NETSCAPE_LDAP}3",
+        "organizationName": f"{X500ATTR_OID}10",
+        "eduPersonAssurance": f"{EDUPERSON_OID}11",
+        "norEduOrgAcronym": f"{NOREDUPERSON_OID}6",
+        "registeredAddress": f"{X500ATTR_OID}26",
+        "physicalDeliveryOfficeName": f"{X500ATTR_OID}19",
+        "associatedDomain": f"{UCL_DIR_PILOT}37",
+        "l": f"{X500ATTR_OID}7",
+        "stateOrProvinceName": f"{X500ATTR_OID}8",
+        "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9",
+        "pkcs9email": f"{PKCS_9}1",
+        "givenName": f"{X500ATTR_OID}42",
+        "givenname": f"{X500ATTR_OID}42",
+        "x500UniqueIdentifier": f"{X500ATTR_OID}45",
+        "eduPersonNickname": f"{EDUPERSON_OID}2",
+        "houseIdentifier": f"{X500ATTR_OID}51",
+        "street": f"{X500ATTR_OID}9",
+        "supportedAlgorithms": f"{X500ATTR_OID}52",
+        "preferredLanguage": f"{NETSCAPE_LDAP}39",
+        "postalAddress": f"{X500ATTR_OID}16",
+        "email": f"{PKCS_9}1",
+        "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8",
+        "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8",
+        "c": f"{X500ATTR_OID}6",
+        "teletexTerminalIdentifier": f"{X500ATTR_OID}22",
+        "o": f"{X500ATTR_OID}10",
+        "cACertificate": f"{X500ATTR_OID}37",
+        "telexNumber": f"{X500ATTR_OID}21",
+        "ou": f"{X500ATTR_OID}11",
+        "initials": f"{X500ATTR_OID}43",
+        "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4",
+        "deltaRevocationList": f"{X500ATTR_OID}53",
+        "norEduPersonLIN": f"{NOREDUPERSON_OID}4",
+        "supportedApplicationContext": f"{X500ATTR_OID}30",
+        "eduPersonEntitlement": f"{EDUPERSON_OID}7",
+        "generationQualifier": f"{X500ATTR_OID}44",
+        "eduPersonAffiliation": f"{EDUPERSON_OID}1",
+        "eduPersonPrincipalName": f"{EDUPERSON_OID}6",
+        "edupersonprincipalname": f"{EDUPERSON_OID}6",
+        "localityName": f"{X500ATTR_OID}7",
+        "owner": f"{X500ATTR_OID}32",
+        "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2",
+        "searchGuide": f"{X500ATTR_OID}14",
+        "certificateRevocationList": f"{X500ATTR_OID}39",
+        "organizationalUnitName": f"{X500ATTR_OID}11",
+        "userCertificate": f"{X500ATTR_OID}36",
+        "preferredDeliveryMethod": f"{X500ATTR_OID}28",
+        "internationaliSDNNumber": f"{X500ATTR_OID}25",
+        "uniqueMember": f"{X500ATTR_OID}50",
+        "departmentNumber": f"{NETSCAPE_LDAP}2",
+        "enhancedSearchGuide": f"{X500ATTR_OID}47",
+        "userPKCS12": f"{NETSCAPE_LDAP}216",
+        "eduPersonTargetedID": f"{EDUPERSON_OID}10",
+        "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1",
+        "x121Address": f"{X500ATTR_OID}24",
+        "destinationIndicator": f"{X500ATTR_OID}27",
+        "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5",
+        "surname": f"{X500ATTR_OID}4",
+        "jpegPhoto": f"{UCL_DIR_PILOT}60",
+        "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9",
+        "edupersonscopedaffiliation": f"{EDUPERSON_OID}9",
+        "protocolInformation": f"{X500ATTR_OID}48",
+        "knowledgeInformation": f"{X500ATTR_OID}2",
+        "employeeType": f"{NETSCAPE_LDAP}4",
+        "userSMIMECertificate": f"{NETSCAPE_LDAP}40",
+        "member": f"{X500ATTR_OID}31",
+        "streetAddress": f"{X500ATTR_OID}9",
+        "dmdName": f"{X500ATTR_OID}54",
+        "postalCode": f"{X500ATTR_OID}17",
+        "pseudonym": f"{X500ATTR_OID}65",
+        "dnQualifier": f"{X500ATTR_OID}46",
+        "crossCertificatePair": f"{X500ATTR_OID}40",
+        "eduPersonOrgDN": f"{EDUPERSON_OID}3",
+        "authorityRevocationList": f"{X500ATTR_OID}38",
+        "displayName": f"{NETSCAPE_LDAP}241",
+        "businessCategory": f"{X500ATTR_OID}15",
+        "serialNumber": f"{X500ATTR_OID}5",
+        "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7",
+        "st": f"{X500ATTR_OID}8",
+        "carLicense": f"{NETSCAPE_LDAP}1",
+        "presentationAddress": f"{X500ATTR_OID}29",
+        "sn": f"{X500ATTR_OID}4",
+        "domainComponent": f"{UCL_DIR_PILOT}25",
+        "labeledURI": f"{UMICH}57",
+        "uid": f"{UCL_DIR_PILOT}1",
     },
 }
diff --git a/example/sp-repoze/attributemaps/shibboleth_uri.py b/example/sp-repoze/attributemaps/shibboleth_uri.py
index 30b31503..992a2219 100644
--- a/example/sp-repoze/attributemaps/shibboleth_uri.py
+++ b/example/sp-repoze/attributemaps/shibboleth_uri.py
@@ -9,182 +9,182 @@ UMICH = "urn:oid:1.3.6.1.4.1.250.1.57."
 MAP = {
     "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri",
     "fro": {
-        EDUPERSON_OID + "2": "eduPersonNickname",
-        EDUPERSON_OID + "9": "eduPersonScopedAffiliation",
-        EDUPERSON_OID + "11": "eduPersonAssurance",
-        EDUPERSON_OID + "10": "eduPersonTargetedID",
-        EDUPERSON_OID + "4": "eduPersonOrgUnitDN",
-        NOREDUPERSON_OID + "6": "norEduOrgAcronym",
-        NOREDUPERSON_OID + "7": "norEduOrgUniqueIdentifier",
-        NOREDUPERSON_OID + "4": "norEduPersonLIN",
-        EDUPERSON_OID + "1": "eduPersonAffiliation",
-        NOREDUPERSON_OID + "2": "norEduOrgUnitUniqueNumber",
-        NETSCAPE_LDAP + "40": "userSMIMECertificate",
-        NOREDUPERSON_OID + "1": "norEduOrgUniqueNumber",
-        NETSCAPE_LDAP + "241": "displayName",
-        UCL_DIR_PILOT + "37": "associatedDomain",
-        EDUPERSON_OID + "6": "eduPersonPrincipalName",
-        NOREDUPERSON_OID + "8": "norEduOrgUnitUniqueIdentifier",
-        NOREDUPERSON_OID + "9": "federationFeideSchemaVersion",
-        X500ATTR + "53": "deltaRevocationList",
-        X500ATTR + "52": "supportedAlgorithms",
-        X500ATTR + "51": "houseIdentifier",
-        X500ATTR + "50": "uniqueMember",
-        X500ATTR + "19": "physicalDeliveryOfficeName",
-        X500ATTR + "18": "postOfficeBox",
-        X500ATTR + "17": "postalCode",
-        X500ATTR + "16": "postalAddress",
-        X500ATTR + "15": "businessCategory",
-        X500ATTR + "14": "searchGuide",
-        EDUPERSON_OID + "5": "eduPersonPrimaryAffiliation",
-        X500ATTR + "12": "title",
-        X500ATTR + "11": "ou",
-        X500ATTR + "10": "o",
-        X500ATTR + "37": "cACertificate",
-        X500ATTR + "36": "userCertificate",
-        X500ATTR + "31": "member",
-        X500ATTR + "30": "supportedApplicationContext",
-        X500ATTR + "33": "roleOccupant",
-        X500ATTR + "32": "owner",
-        NETSCAPE_LDAP + "1": "carLicense",
-        PKCS_9 + "1": "email",
-        NETSCAPE_LDAP + "3": "employeeNumber",
-        NETSCAPE_LDAP + "2": "departmentNumber",
-        X500ATTR + "39": "certificateRevocationList",
-        X500ATTR + "38": "authorityRevocationList",
-        NETSCAPE_LDAP + "216": "userPKCS12",
-        EDUPERSON_OID + "8": "eduPersonPrimaryOrgUnitDN",
-        X500ATTR + "9": "street",
-        X500ATTR + "8": "st",
-        NETSCAPE_LDAP + "39": "preferredLanguage",
-        EDUPERSON_OID + "7": "eduPersonEntitlement",
-        X500ATTR + "2": "knowledgeInformation",
-        X500ATTR + "7": "l",
-        X500ATTR + "6": "c",
-        X500ATTR + "5": "serialNumber",
-        X500ATTR + "4": "sn",
-        UCL_DIR_PILOT + "60": "jpegPhoto",
-        X500ATTR + "65": "pseudonym",
-        NOREDUPERSON_OID + "5": "norEduPersonNIN",
-        UCL_DIR_PILOT + "3": "mail",
-        UCL_DIR_PILOT + "25": "dc",
-        X500ATTR + "40": "crossCertificatePair",
-        X500ATTR + "42": "givenName",
-        X500ATTR + "43": "initials",
-        X500ATTR + "44": "generationQualifier",
-        X500ATTR + "45": "x500UniqueIdentifier",
-        X500ATTR + "46": "dnQualifier",
-        X500ATTR + "47": "enhancedSearchGuide",
-        X500ATTR + "48": "protocolInformation",
-        X500ATTR + "54": "dmdName",
-        NETSCAPE_LDAP + "4": "employeeType",
-        X500ATTR + "22": "teletexTerminalIdentifier",
-        X500ATTR + "23": "facsimileTelephoneNumber",
-        X500ATTR + "20": "telephoneNumber",
-        X500ATTR + "21": "telexNumber",
-        X500ATTR + "26": "registeredAddress",
-        X500ATTR + "27": "destinationIndicator",
-        X500ATTR + "24": "x121Address",
-        X500ATTR + "25": "internationaliSDNNumber",
-        X500ATTR + "28": "preferredDeliveryMethod",
-        X500ATTR + "29": "presentationAddress",
-        EDUPERSON_OID + "3": "eduPersonOrgDN",
-        NOREDUPERSON_OID + "3": "norEduPersonBirthDate",
+        f"{EDUPERSON_OID}2": "eduPersonNickname",
+        f"{EDUPERSON_OID}9": "eduPersonScopedAffiliation",
+        f"{EDUPERSON_OID}11": "eduPersonAssurance",
+        f"{EDUPERSON_OID}10": "eduPersonTargetedID",
+        f"{EDUPERSON_OID}4": "eduPersonOrgUnitDN",
+        f"{NOREDUPERSON_OID}6": "norEduOrgAcronym",
+        f"{NOREDUPERSON_OID}7": "norEduOrgUniqueIdentifier",
+        f"{NOREDUPERSON_OID}4": "norEduPersonLIN",
+        f"{EDUPERSON_OID}1": "eduPersonAffiliation",
+        f"{NOREDUPERSON_OID}2": "norEduOrgUnitUniqueNumber",
+        f"{NETSCAPE_LDAP}40": "userSMIMECertificate",
+        f"{NOREDUPERSON_OID}1": "norEduOrgUniqueNumber",
+        f"{NETSCAPE_LDAP}241": "displayName",
+        f"{UCL_DIR_PILOT}37": "associatedDomain",
+        f"{EDUPERSON_OID}6": "eduPersonPrincipalName",
+        f"{NOREDUPERSON_OID}8": "norEduOrgUnitUniqueIdentifier",
+        f"{NOREDUPERSON_OID}9": "federationFeideSchemaVersion",
+        f"{X500ATTR}53": "deltaRevocationList",
+        f"{X500ATTR}52": "supportedAlgorithms",
+        f"{X500ATTR}51": "houseIdentifier",
+        f"{X500ATTR}50": "uniqueMember",
+        f"{X500ATTR}19": "physicalDeliveryOfficeName",
+        f"{X500ATTR}18": "postOfficeBox",
+        f"{X500ATTR}17": "postalCode",
+        f"{X500ATTR}16": "postalAddress",
+        f"{X500ATTR}15": "businessCategory",
+        f"{X500ATTR}14": "searchGuide",
+        f"{EDUPERSON_OID}5": "eduPersonPrimaryAffiliation",
+        f"{X500ATTR}12": "title",
+        f"{X500ATTR}11": "ou",
+        f"{X500ATTR}10": "o",
+        f"{X500ATTR}37": "cACertificate",
+        f"{X500ATTR}36": "userCertificate",
+        f"{X500ATTR}31": "member",
+        f"{X500ATTR}30": "supportedApplicationContext",
+        f"{X500ATTR}33": "roleOccupant",
+        f"{X500ATTR}32": "owner",
+        f"{NETSCAPE_LDAP}1": "carLicense",
+        f"{PKCS_9}1": "email",
+        f"{NETSCAPE_LDAP}3": "employeeNumber",
+        f"{NETSCAPE_LDAP}2": "departmentNumber",
+        f"{X500ATTR}39": "certificateRevocationList",
+        f"{X500ATTR}38": "authorityRevocationList",
+        f"{NETSCAPE_LDAP}216": "userPKCS12",
+        f"{EDUPERSON_OID}8": "eduPersonPrimaryOrgUnitDN",
+        f"{X500ATTR}9": "street",
+        f"{X500ATTR}8": "st",
+        f"{NETSCAPE_LDAP}39": "preferredLanguage",
+        f"{EDUPERSON_OID}7": "eduPersonEntitlement",
+        f"{X500ATTR}2": "knowledgeInformation",
+        f"{X500ATTR}7": "l",
+        f"{X500ATTR}6": "c",
+        f"{X500ATTR}5": "serialNumber",
+        f"{X500ATTR}4": "sn",
+        f"{UCL_DIR_PILOT}60": "jpegPhoto",
+        f"{X500ATTR}65": "pseudonym",
+        f"{NOREDUPERSON_OID}5": "norEduPersonNIN",
+        f"{UCL_DIR_PILOT}3": "mail",
+        f"{UCL_DIR_PILOT}25": "dc",
+        f"{X500ATTR}40": "crossCertificatePair",
+        f"{X500ATTR}42": "givenName",
+        f"{X500ATTR}43": "initials",
+        f"{X500ATTR}44": "generationQualifier",
+        f"{X500ATTR}45": "x500UniqueIdentifier",
+        f"{X500ATTR}46": "dnQualifier",
+        f"{X500ATTR}47": "enhancedSearchGuide",
+        f"{X500ATTR}48": "protocolInformation",
+        f"{X500ATTR}54": "dmdName",
+        f"{NETSCAPE_LDAP}4": "employeeType",
+        f"{X500ATTR}22": "teletexTerminalIdentifier",
+        f"{X500ATTR}23": "facsimileTelephoneNumber",
+        f"{X500ATTR}20": "telephoneNumber",
+        f"{X500ATTR}21": "telexNumber",
+        f"{X500ATTR}26": "registeredAddress",
+        f"{X500ATTR}27": "destinationIndicator",
+        f"{X500ATTR}24": "x121Address",
+        f"{X500ATTR}25": "internationaliSDNNumber",
+        f"{X500ATTR}28": "preferredDeliveryMethod",
+        f"{X500ATTR}29": "presentationAddress",
+        f"{EDUPERSON_OID}3": "eduPersonOrgDN",
+        f"{NOREDUPERSON_OID}3": "norEduPersonBirthDate",
     },
     "to": {
-        "roleOccupant": X500ATTR + "33",
-        "gn": X500ATTR + "42",
-        "norEduPersonNIN": NOREDUPERSON_OID + "5",
-        "title": X500ATTR + "12",
-        "facsimileTelephoneNumber": X500ATTR + "23",
-        "mail": UCL_DIR_PILOT + "3",
-        "postOfficeBox": X500ATTR + "18",
-        "fax": X500ATTR + "23",
-        "telephoneNumber": X500ATTR + "20",
-        "norEduPersonBirthDate": NOREDUPERSON_OID + "3",
-        "rfc822Mailbox": UCL_DIR_PILOT + "3",
-        "dc": UCL_DIR_PILOT + "25",
-        "countryName": X500ATTR + "6",
-        "emailAddress": PKCS_9 + "1",
-        "employeeNumber": NETSCAPE_LDAP + "3",
-        "organizationName": X500ATTR + "10",
-        "eduPersonAssurance": EDUPERSON_OID + "11",
-        "norEduOrgAcronym": NOREDUPERSON_OID + "6",
-        "registeredAddress": X500ATTR + "26",
-        "physicalDeliveryOfficeName": X500ATTR + "19",
-        "associatedDomain": UCL_DIR_PILOT + "37",
-        "l": X500ATTR + "7",
-        "stateOrProvinceName": X500ATTR + "8",
-        "federationFeideSchemaVersion": NOREDUPERSON_OID + "9",
-        "pkcs9email": PKCS_9 + "1",
-        "givenName": X500ATTR + "42",
-        "x500UniqueIdentifier": X500ATTR + "45",
-        "eduPersonNickname": EDUPERSON_OID + "2",
-        "houseIdentifier": X500ATTR + "51",
-        "street": X500ATTR + "9",
-        "supportedAlgorithms": X500ATTR + "52",
-        "preferredLanguage": NETSCAPE_LDAP + "39",
-        "postalAddress": X500ATTR + "16",
-        "email": PKCS_9 + "1",
-        "norEduOrgUnitUniqueIdentifier": NOREDUPERSON_OID + "8",
-        "eduPersonPrimaryOrgUnitDN": EDUPERSON_OID + "8",
-        "c": X500ATTR + "6",
-        "teletexTerminalIdentifier": X500ATTR + "22",
-        "o": X500ATTR + "10",
-        "cACertificate": X500ATTR + "37",
-        "telexNumber": X500ATTR + "21",
-        "ou": X500ATTR + "11",
-        "initials": X500ATTR + "43",
-        "eduPersonOrgUnitDN": EDUPERSON_OID + "4",
-        "deltaRevocationList": X500ATTR + "53",
-        "norEduPersonLIN": NOREDUPERSON_OID + "4",
-        "supportedApplicationContext": X500ATTR + "30",
-        "eduPersonEntitlement": EDUPERSON_OID + "7",
-        "generationQualifier": X500ATTR + "44",
-        "eduPersonAffiliation": EDUPERSON_OID + "1",
-        "eduPersonPrincipalName": EDUPERSON_OID + "6",
-        "localityName": X500ATTR + "7",
-        "owner": X500ATTR + "32",
-        "norEduOrgUnitUniqueNumber": NOREDUPERSON_OID + "2",
-        "searchGuide": X500ATTR + "14",
-        "certificateRevocationList": X500ATTR + "39",
-        "organizationalUnitName": X500ATTR + "11",
-        "userCertificate": X500ATTR + "36",
-        "preferredDeliveryMethod": X500ATTR + "28",
-        "internationaliSDNNumber": X500ATTR + "25",
-        "uniqueMember": X500ATTR + "50",
-        "departmentNumber": NETSCAPE_LDAP + "2",
-        "enhancedSearchGuide": X500ATTR + "47",
-        "userPKCS12": NETSCAPE_LDAP + "216",
-        "eduPersonTargetedID": EDUPERSON_OID + "10",
-        "norEduOrgUniqueNumber": NOREDUPERSON_OID + "1",
-        "x121Address": X500ATTR + "24",
-        "destinationIndicator": X500ATTR + "27",
-        "eduPersonPrimaryAffiliation": EDUPERSON_OID + "5",
-        "surname": X500ATTR + "4",
-        "jpegPhoto": UCL_DIR_PILOT + "60",
-        "eduPersonScopedAffiliation": EDUPERSON_OID + "9",
-        "protocolInformation": X500ATTR + "48",
-        "knowledgeInformation": X500ATTR + "2",
-        "employeeType": NETSCAPE_LDAP + "4",
-        "userSMIMECertificate": NETSCAPE_LDAP + "40",
-        "member": X500ATTR + "31",
-        "streetAddress": X500ATTR + "9",
-        "dmdName": X500ATTR + "54",
-        "postalCode": X500ATTR + "17",
-        "pseudonym": X500ATTR + "65",
-        "dnQualifier": X500ATTR + "46",
-        "crossCertificatePair": X500ATTR + "40",
-        "eduPersonOrgDN": EDUPERSON_OID + "3",
-        "authorityRevocationList": X500ATTR + "38",
-        "displayName": NETSCAPE_LDAP + "241",
-        "businessCategory": X500ATTR + "15",
-        "serialNumber": X500ATTR + "5",
-        "norEduOrgUniqueIdentifier": NOREDUPERSON_OID + "7",
-        "st": X500ATTR + "8",
-        "carLicense": NETSCAPE_LDAP + "1",
-        "presentationAddress": X500ATTR + "29",
-        "sn": X500ATTR + "4",
-        "domainComponent": UCL_DIR_PILOT + "25",
+        "roleOccupant": f"{X500ATTR}33",
+        "gn": f"{X500ATTR}42",
+        "norEduPersonNIN": f"{NOREDUPERSON_OID}5",
+        "title": f"{X500ATTR}12",
+        "facsimileTelephoneNumber": f"{X500ATTR}23",
+        "mail": f"{UCL_DIR_PILOT}3",
+        "postOfficeBox": f"{X500ATTR}18",
+        "fax": f"{X500ATTR}23",
+        "telephoneNumber": f"{X500ATTR}20",
+        "norEduPersonBirthDate": f"{NOREDUPERSON_OID}3",
+        "rfc822Mailbox": f"{UCL_DIR_PILOT}3",
+        "dc": f"{UCL_DIR_PILOT}25",
+        "countryName": f"{X500ATTR}6",
+        "emailAddress": f"{PKCS_9}1",
+        "employeeNumber": f"{NETSCAPE_LDAP}3",
+        "organizationName": f"{X500ATTR}10",
+        "eduPersonAssurance": f"{EDUPERSON_OID}11",
+        "norEduOrgAcronym": f"{NOREDUPERSON_OID}6",
+        "registeredAddress": f"{X500ATTR}26",
+        "physicalDeliveryOfficeName": f"{X500ATTR}19",
+        "associatedDomain": f"{UCL_DIR_PILOT}37",
+        "l": f"{X500ATTR}7",
+        "stateOrProvinceName": f"{X500ATTR}8",
+        "federationFeideSchemaVersion": f"{NOREDUPERSON_OID}9",
+        "pkcs9email": f"{PKCS_9}1",
+        "givenName": f"{X500ATTR}42",
+        "x500UniqueIdentifier": f"{X500ATTR}45",
+        "eduPersonNickname": f"{EDUPERSON_OID}2",
+        "houseIdentifier": f"{X500ATTR}51",
+        "street": f"{X500ATTR}9",
+        "supportedAlgorithms": f"{X500ATTR}52",
+        "preferredLanguage": f"{NETSCAPE_LDAP}39",
+        "postalAddress": f"{X500ATTR}16",
+        "email": f"{PKCS_9}1",
+        "norEduOrgUnitUniqueIdentifier": f"{NOREDUPERSON_OID}8",
+        "eduPersonPrimaryOrgUnitDN": f"{EDUPERSON_OID}8",
+        "c": f"{X500ATTR}6",
+        "teletexTerminalIdentifier": f"{X500ATTR}22",
+        "o": f"{X500ATTR}10",
+        "cACertificate": f"{X500ATTR}37",
+        "telexNumber": f"{X500ATTR}21",
+        "ou": f"{X500ATTR}11",
+        "initials": f"{X500ATTR}43",
+        "eduPersonOrgUnitDN": f"{EDUPERSON_OID}4",
+        "deltaRevocationList": f"{X500ATTR}53",
+        "norEduPersonLIN": f"{NOREDUPERSON_OID}4",
+        "supportedApplicationContext": f"{X500ATTR}30",
+        "eduPersonEntitlement": f"{EDUPERSON_OID}7",
+        "generationQualifier": f"{X500ATTR}44",
+        "eduPersonAffiliation": f"{EDUPERSON_OID}1",
+        "eduPersonPrincipalName": f"{EDUPERSON_OID}6",
+        "localityName": f"{X500ATTR}7",
+        "owner": f"{X500ATTR}32",
+        "norEduOrgUnitUniqueNumber": f"{NOREDUPERSON_OID}2",
+        "searchGuide": f"{X500ATTR}14",
+        "certificateRevocationList": f"{X500ATTR}39",
+        "organizationalUnitName": f"{X500ATTR}11",
+        "userCertificate": f"{X500ATTR}36",
+        "preferredDeliveryMethod": f"{X500ATTR}28",
+        "internationaliSDNNumber": f"{X500ATTR}25",
+        "uniqueMember": f"{X500ATTR}50",
+        "departmentNumber": f"{NETSCAPE_LDAP}2",
+        "enhancedSearchGuide": f"{X500ATTR}47",
+        "userPKCS12": f"{NETSCAPE_LDAP}216",
+        "eduPersonTargetedID": f"{EDUPERSON_OID}10",
+        "norEduOrgUniqueNumber": f"{NOREDUPERSON_OID}1",
+        "x121Address": f"{X500ATTR}24",
+        "destinationIndicator": f"{X500ATTR}27",
+        "eduPersonPrimaryAffiliation": f"{EDUPERSON_OID}5",
+        "surname": f"{X500ATTR}4",
+        "jpegPhoto": f"{UCL_DIR_PILOT}60",
+        "eduPersonScopedAffiliation": f"{EDUPERSON_OID}9",
+        "protocolInformation": f"{X500ATTR}48",
+        "knowledgeInformation": f"{X500ATTR}2",
+        "employeeType": f"{NETSCAPE_LDAP}4",
+        "userSMIMECertificate": f"{NETSCAPE_LDAP}40",
+        "member": f"{X500ATTR}31",
+        "streetAddress": f"{X500ATTR}9",
+        "dmdName": f"{X500ATTR}54",
+        "postalCode": f"{X500ATTR}17",
+        "pseudonym": f"{X500ATTR}65",
+        "dnQualifier": f"{X500ATTR}46",
+        "crossCertificatePair": f"{X500ATTR}40",
+        "eduPersonOrgDN": f"{EDUPERSON_OID}3",
+        "authorityRevocationList": f"{X500ATTR}38",
+        "displayName": f"{NETSCAPE_LDAP}241",
+        "businessCategory": f"{X500ATTR}15",
+        "serialNumber": f"{X500ATTR}5",
+        "norEduOrgUniqueIdentifier": f"{NOREDUPERSON_OID}7",
+        "st": f"{X500ATTR}8",
+        "carLicense": f"{NETSCAPE_LDAP}1",
+        "presentationAddress": f"{X500ATTR}29",
+        "sn": f"{X500ATTR}4",
+        "domainComponent": f"{UCL_DIR_PILOT}25",
     },
 }
diff --git a/example/sp-repoze/sp.py b/example/sp-repoze/sp.py
index d0429289..1c837962 100755
--- a/example/sp-repoze/sp.py
+++ b/example/sp-repoze/sp.py
@@ -209,7 +209,7 @@ def metadata(environ, start_response):
         if path[-1] != "/":
             path += "/"
         metadata = create_metadata_string(
-            path + "sp_conf.py", None, args.valid, args.cert, args.keyfile, args.id, args.name, args.sign
+            f"{path}sp_conf.py", None, args.valid, args.cert, args.keyfile, args.id, args.name, args.sign
         )
         start_response("200 OK", [("Content-Type", "text/xml")])
         return metadata
diff --git a/example/sp-wsgi/sp.py b/example/sp-wsgi/sp.py
index 35061236..926ea036 100755
--- a/example/sp-wsgi/sp.py
+++ b/example/sp-wsgi/sp.py
@@ -797,7 +797,7 @@ def metadata(environ, start_response):
         if path[-1] != "/":
             path += "/"
         metadata = create_metadata_string(
-            path + "sp_conf.py",
+            f"{path}sp_conf.py",
             None,
             _args.valid,
             _args.cert,