Skip to content

Commit 15f131d

Browse files
akxc00kiemon5ter
akx
authored and
c00kiemon5ter
committed
Run flynt + black + isort
1 parent 3824f60 commit 15f131d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+404
-449
lines changed

‎example/idp2/idp.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None, **kwargs):
359359
kwargs = {}
360360

361361
http_args = IDP.apply_binding(
362-
self.binding_out, "%s" % _resp, self.destination, relay_state, response=True, **kwargs
362+
self.binding_out, f"{_resp}", self.destination, relay_state, response=True, **kwargs
363363
)
364364

365365
logger.debug("HTTPargs: %s", http_args)
@@ -587,7 +587,7 @@ def do_verify(environ, start_response, _):
587587

588588
kaka = set_cookie("idpauthn", "/", uid, query["authn_reference"][0])
589589

590-
lox = "{}?id={}&key={}".format(query["redirect_uri"][0], uid, query["key"][0])
590+
lox = f"{query['redirect_uri'][0]}?id={uid}&key={query['key'][0]}"
591591
logger.debug("Redirect => %s", lox)
592592
resp = Redirect(lox, headers=[kaka], content="text/html")
593593

@@ -622,7 +622,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None, **kwargs):
622622
req_info = IDP.parse_logout_request(request, binding)
623623
except Exception as exc:
624624
logger.error("Bad request: %s", exc)
625-
resp = BadRequest("%s" % exc)
625+
resp = BadRequest(f"{exc}")
626626
return resp(self.environ, self.start_response)
627627

628628
msg = req_info.message
@@ -652,10 +652,10 @@ def do(self, request, binding, relay_state="", encrypt_cert=None, **kwargs):
652652
response = True
653653

654654
try:
655-
hinfo = IDP.apply_binding(binding, "%s" % resp, destination, relay_state, response=response)
655+
hinfo = IDP.apply_binding(binding, f"{resp}", destination, relay_state, response=response)
656656
except Exception as exc:
657657
logger.error("ServiceError: %s", exc)
658-
resp = ServiceError("%s" % exc)
658+
resp = ServiceError(f"{exc}")
659659
return resp(self.environ, self.start_response)
660660

661661
# _tlh = dict2list_of_tuples(hinfo["headers"])
@@ -698,7 +698,7 @@ def do(self, query, binding, relay_state="", encrypt_cert=None):
698698
_resp = IDP.create_manage_name_id_response(request)
699699

700700
# It's using SOAP binding
701-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", relay_state, response=True)
701+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{_resp}", "", relay_state, response=True)
702702

703703
resp = Response(hinfo["data"], headers=hinfo["headers"])
704704
return resp(self.environ, self.start_response)
@@ -720,7 +720,7 @@ def do(self, aid, binding, relay_state="", encrypt_cert=None):
720720
resp = NotFound(aid)
721721
return resp(self.environ, self.start_response)
722722

723-
hinfo = IDP.apply_binding(BINDING_URI, "%s" % assertion, response=True)
723+
hinfo = IDP.apply_binding(BINDING_URI, f"{assertion}", response=True)
724724

725725
logger.debug("HINFO: %s", hinfo)
726726
resp = Response(hinfo["data"], headers=hinfo["headers"])
@@ -746,7 +746,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
746746

747747
msg = IDP.create_artifact_response(_req, _req.artifact.text)
748748

749-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
749+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
750750

751751
resp = Response(hinfo["data"], headers=hinfo["headers"])
752752
return resp(self.environ, self.start_response)
@@ -767,7 +767,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
767767
msg = IDP.create_authn_query_response(_query.subject, _query.requested_authn_context, _query.session_index)
768768

769769
logger.debug("response: %s", msg)
770-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
770+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
771771

772772
resp = Response(hinfo["data"], headers=hinfo["headers"])
773773
return resp(self.environ, self.start_response)
@@ -796,7 +796,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
796796
msg = IDP.create_attribute_response(identity, name_id=name_id, **args)
797797

798798
logger.debug("response: %s", msg)
799-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
799+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
800800

801801
resp = Response(hinfo["data"], headers=hinfo["headers"])
802802
return resp(self.environ, self.start_response)
@@ -829,7 +829,7 @@ def do(self, query, binding, relay_state="", encrypt_cert=None):
829829
_resp = IDP.create_name_id_mapping_response(name_id, **info)
830830

831831
# Only SOAP
832-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", "", response=True)
832+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{_resp}", "", "", response=True)
833833

834834
resp = Response(hinfo["data"], headers=hinfo["headers"])
835835
return resp(self.environ, self.start_response)

‎example/idp2/idp_uwsgi.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None):
311311
kwargs = {}
312312

313313
http_args = IDP.apply_binding(
314-
self.binding_out, "%s" % _resp, self.destination, relay_state, response=True, **kwargs
314+
self.binding_out, f"{_resp}", self.destination, relay_state, response=True, **kwargs
315315
)
316316

317317
logger.debug("HTTPargs: %s", http_args)
@@ -511,7 +511,7 @@ def do_verify(environ, start_response, _):
511511

512512
kaka = set_cookie("idpauthn", "/", uid, query["authn_reference"][0])
513513

514-
lox = "{}?id={}&key={}".format(query["redirect_uri"][0], uid, query["key"][0])
514+
lox = f"{query['redirect_uri'][0]}?id={uid}&key={query['key'][0]}"
515515
logger.debug("Redirect => %s", lox)
516516
resp = Redirect(lox, headers=[kaka], content="text/html")
517517

@@ -545,7 +545,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
545545
req_info = IDP.parse_logout_request(body, binding)
546546
except Exception as exc:
547547
logger.error("Bad request: %s", exc)
548-
resp = BadRequest("%s" % exc)
548+
resp = BadRequest(f"{exc}")
549549
return resp(self.environ, self.start_response)
550550

551551
msg = req_info.message
@@ -562,16 +562,16 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
562562
IDP.session_db.remove_authn_statements(msg.name_id)
563563
except KeyError as exc:
564564
logger.error("ServiceError: %s", exc)
565-
resp = ServiceError("%s" % exc)
565+
resp = ServiceError(f"{exc}")
566566
return resp(self.environ, self.start_response)
567567

568568
resp = IDP.create_logout_response(msg, [binding])
569569

570570
try:
571-
hinfo = IDP.apply_binding(binding, "%s" % resp, "", relay_state)
571+
hinfo = IDP.apply_binding(binding, f"{resp}", "", relay_state)
572572
except Exception as exc:
573573
logger.error("ServiceError: %s", exc)
574-
resp = ServiceError("%s" % exc)
574+
resp = ServiceError(f"{exc}")
575575
return resp(self.environ, self.start_response)
576576

577577
# _tlh = dict2list_of_tuples(hinfo["headers"])
@@ -604,7 +604,7 @@ def do(self, query, binding, relay_state="", encrypt_cert=None):
604604
_resp = IDP.create_manage_name_id_response(request)
605605

606606
# It's using SOAP binding
607-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", relay_state, response=True)
607+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{_resp}", "", relay_state, response=True)
608608

609609
resp = Response(hinfo["data"], headers=hinfo["headers"])
610610
return resp(self.environ, self.start_response)
@@ -626,7 +626,7 @@ def do(self, aid, binding, relay_state="", encrypt_cert=None):
626626
resp = NotFound(aid)
627627
return resp(self.environ, self.start_response)
628628

629-
hinfo = IDP.apply_binding(BINDING_URI, "%s" % assertion, response=True)
629+
hinfo = IDP.apply_binding(BINDING_URI, f"{assertion}", response=True)
630630

631631
logger.debug("HINFO: %s", hinfo)
632632
resp = Response(hinfo["data"], headers=hinfo["headers"])
@@ -652,7 +652,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
652652

653653
msg = IDP.create_artifact_response(_req, _req.artifact.text)
654654

655-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
655+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
656656

657657
resp = Response(hinfo["data"], headers=hinfo["headers"])
658658
return resp(self.environ, self.start_response)
@@ -673,7 +673,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
673673
msg = IDP.create_authn_query_response(_query.subject, _query.requested_authn_context, _query.session_index)
674674

675675
logger.debug("response: %s", msg)
676-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
676+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
677677

678678
resp = Response(hinfo["data"], headers=hinfo["headers"])
679679
return resp(self.environ, self.start_response)
@@ -702,7 +702,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
702702
msg = IDP.create_attribute_response(identity, name_id=name_id, **args)
703703

704704
logger.debug("response: %s", msg)
705-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
705+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
706706

707707
resp = Response(hinfo["data"], headers=hinfo["headers"])
708708
return resp(self.environ, self.start_response)
@@ -735,7 +735,7 @@ def do(self, query, binding, relay_state="", encrypt_cert=None):
735735
_resp = IDP.create_name_id_mapping_response(name_id, **info)
736736

737737
# Only SOAP
738-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", "", response=True)
738+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{_resp}", "", "", response=True)
739739

740740
resp = Response(hinfo["data"], headers=hinfo["headers"])
741741
return resp(self.environ, self.start_response)
@@ -948,8 +948,8 @@ def application(environ, start_response):
948948

949949

950950
AUTHN_BROKER = AuthnBroker()
951-
AUTHN_BROKER.add(authn_context_class_ref(PASSWORD), username_password_authn, 10, "http://%s" % socket.gethostname())
952-
AUTHN_BROKER.add(authn_context_class_ref(UNSPECIFIED), "", 0, "http://%s" % socket.gethostname())
951+
AUTHN_BROKER.add(authn_context_class_ref(PASSWORD), username_password_authn, 10, f"http://{socket.gethostname()}")
952+
AUTHN_BROKER.add(authn_context_class_ref(UNSPECIFIED), "", 0, f"http://{socket.gethostname()}")
953953
CONFIG = importlib.import_module(args.config)
954954
IDP = server.Server(args.config, cache=Cache())
955955
IDP.ticket = {}

‎example/idp2_repoze/idp.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def do(self, query, binding_in, relay_state=""):
309309
return resp(self.environ, self.start_response)
310310

311311
logger.info("AuthNResponse: %s", _resp)
312-
http_args = IDP.apply_binding(self.binding_out, "%s" % _resp, self.destination, relay_state, response=True)
312+
http_args = IDP.apply_binding(self.binding_out, f"{_resp}", self.destination, relay_state, response=True)
313313
logger.debug("HTTPargs: %s", http_args)
314314
return self.response(self.binding_out, http_args)
315315

@@ -505,7 +505,7 @@ def do_verify(environ, start_response, _):
505505

506506
kaka = set_cookie("idpauthn", "/", uid, query["authn_reference"][0])
507507

508-
lox = "{}?id={}&key={}".format(query["redirect_uri"][0], uid, query["key"][0])
508+
lox = f"{query['redirect_uri'][0]}?id={uid}&key={query['key'][0]}"
509509
logger.debug("Redirect => %s", lox)
510510
resp = Redirect(lox, headers=[kaka], content="text/html")
511511

@@ -539,7 +539,7 @@ def do(self, request, binding, relay_state=""):
539539
req_info = IDP.parse_logout_request(body, binding)
540540
except Exception as exc:
541541
logger.error("Bad request: %s", exc)
542-
resp = BadRequest("%s" % exc)
542+
resp = BadRequest(f"{exc}")
543543
return resp(self.environ, self.start_response)
544544

545545
msg = req_info.message
@@ -556,16 +556,16 @@ def do(self, request, binding, relay_state=""):
556556
IDP.session_db.remove_authn_statements(msg.name_id)
557557
except KeyError as exc:
558558
logger.error("ServiceError: %s", exc)
559-
resp = ServiceError("%s" % exc)
559+
resp = ServiceError(f"{exc}")
560560
return resp(self.environ, self.start_response)
561561

562562
resp = IDP.create_logout_response(msg, [binding])
563563

564564
try:
565-
hinfo = IDP.apply_binding(binding, "%s" % resp, "", relay_state)
565+
hinfo = IDP.apply_binding(binding, f"{resp}", "", relay_state)
566566
except Exception as exc:
567567
logger.error("ServiceError: %s", exc)
568-
resp = ServiceError("%s" % exc)
568+
resp = ServiceError(f"{exc}")
569569
return resp(self.environ, self.start_response)
570570

571571
# _tlh = dict2list_of_tuples(hinfo["headers"])
@@ -598,7 +598,7 @@ def do(self, query, binding, relay_state=""):
598598
_resp = IDP.create_manage_name_id_response(request)
599599

600600
# It's using SOAP binding
601-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", relay_state, response=True)
601+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{_resp}", "", relay_state, response=True)
602602

603603
resp = Response(hinfo["data"], headers=hinfo["headers"])
604604
return resp(self.environ, self.start_response)
@@ -620,7 +620,7 @@ def do(self, aid, binding, relay_state=""):
620620
resp = NotFound(aid)
621621
return resp(self.environ, self.start_response)
622622

623-
hinfo = IDP.apply_binding(BINDING_URI, "%s" % assertion, response=True)
623+
hinfo = IDP.apply_binding(BINDING_URI, f"{assertion}", response=True)
624624

625625
logger.debug("HINFO: %s", hinfo)
626626
resp = Response(hinfo["data"], headers=hinfo["headers"])
@@ -646,7 +646,7 @@ def do(self, request, binding, relay_state=""):
646646

647647
msg = IDP.create_artifact_response(_req, _req.artifact.text)
648648

649-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
649+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
650650

651651
resp = Response(hinfo["data"], headers=hinfo["headers"])
652652
return resp(self.environ, self.start_response)
@@ -667,7 +667,7 @@ def do(self, request, binding, relay_state=""):
667667
msg = IDP.create_authn_query_response(_query.subject, _query.requested_authn_context, _query.session_index)
668668

669669
logger.debug("response: %s", msg)
670-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
670+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
671671

672672
resp = Response(hinfo["data"], headers=hinfo["headers"])
673673
return resp(self.environ, self.start_response)
@@ -696,7 +696,7 @@ def do(self, request, binding, relay_state=""):
696696
msg = IDP.create_attribute_response(identity, name_id=name_id, **args)
697697

698698
logger.debug("response: %s", msg)
699-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % msg, "", "", response=True)
699+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{msg}", "", "", response=True)
700700

701701
resp = Response(hinfo["data"], headers=hinfo["headers"])
702702
return resp(self.environ, self.start_response)
@@ -729,7 +729,7 @@ def do(self, query, binding, relay_state=""):
729729
_resp = IDP.create_name_id_mapping_response(name_id, **info)
730730

731731
# Only SOAP
732-
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", "", response=True)
732+
hinfo = IDP.apply_binding(BINDING_SOAP, f"{_resp}", "", "", response=True)
733733

734734
resp = Response(hinfo["data"], headers=hinfo["headers"])
735735
return resp(self.environ, self.start_response)
@@ -937,8 +937,8 @@ def application(environ, start_response):
937937

938938

939939
AUTHN_BROKER = AuthnBroker()
940-
AUTHN_BROKER.add(authn_context_class_ref(PASSWORD), username_password_authn, 10, "http://%s" % socket.gethostname())
941-
AUTHN_BROKER.add(authn_context_class_ref(UNSPECIFIED), "", 0, "http://%s" % socket.gethostname())
940+
AUTHN_BROKER.add(authn_context_class_ref(PASSWORD), username_password_authn, 10, f"http://{socket.gethostname()}")
941+
AUTHN_BROKER.add(authn_context_class_ref(UNSPECIFIED), "", 0, f"http://{socket.gethostname()}")
942942

943943
IDP = server.Server(args.config, cache=Cache())
944944
IDP.ticket = {}

‎example/sp-repoze/sp.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@
2626

2727

2828
def dict_to_table(ava, lev=0, width=1):
29-
txt = ['<table border=%s bordercolor="black">\n' % width]
29+
txt = [f'<table border={width} bordercolor="black">\n']
3030
for prop, valarr in ava.items():
3131
txt.append("<tr>\n")
3232
if isinstance(valarr, basestring):
33-
txt.append("<th>%s</th>\n" % str(prop))
33+
txt.append(f"<th>{str(prop)}</th>\n")
3434
try:
35-
txt.append("<td>%s</td>\n" % valarr.encode("utf8"))
35+
txt.append(f"<td>{valarr.encode('utf8')}</td>\n")
3636
except AttributeError:
37-
txt.append("<td>%s</td>\n" % valarr)
37+
txt.append(f"<td>{valarr}</td>\n")
3838
elif isinstance(valarr, list):
3939
i = 0
4040
n = len(valarr)
4141
for val in valarr:
4242
if not i:
43-
txt.append("<th rowspan=%d>%s</td>\n" % (len(valarr), prop))
43+
txt.append(f"<th rowspan={len(valarr)}>{prop}</td>\n")
4444
else:
4545
txt.append("<tr>\n")
4646
if isinstance(val, dict):
@@ -49,15 +49,15 @@ def dict_to_table(ava, lev=0, width=1):
4949
txt.append("</td>\n")
5050
else:
5151
try:
52-
txt.append("<td>%s</td>\n" % val.encode("utf8"))
52+
txt.append(f"<td>{val.encode('utf8')}</td>\n")
5353
except AttributeError:
54-
txt.append("<td>%s</td>\n" % val)
54+
txt.append(f"<td>{val}</td>\n")
5555
if n > 1:
5656
txt.append("</tr>\n")
5757
n -= 1
5858
i += 1
5959
elif isinstance(valarr, dict):
60-
txt.append("<th>%s</th>\n" % prop)
60+
txt.append(f"<th>{prop}</th>\n")
6161
txt.append("<td>\n")
6262
txt.extend(dict_to_table(valarr, lev + 1, width - 1))
6363
txt.append("</td>\n")

0 commit comments

Comments
 (0)