Skip to content

Commit 0390049

Browse files
akxakx
committed
Run flynt
1 parent 6e9d2ea commit 0390049

Some content is hidden

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

76 files changed

+562
-607
lines changed

‎example/idp2/idp.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,11 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None, **kwargs):
322322
resp_args, _resp = self.verify_request(query, binding_in)
323323
except UnknownPrincipal as excp:
324324
logger.error("UnknownPrincipal: %s", excp)
325-
resp = ServiceError("UnknownPrincipal: {}".format(excp))
325+
resp = ServiceError(f"UnknownPrincipal: {excp}")
326326
return resp(self.environ, self.start_response)
327327
except UnsupportedBinding as excp:
328328
logger.error("UnsupportedBinding: %s", excp)
329-
resp = ServiceError("UnsupportedBinding: {}".format(excp))
329+
resp = ServiceError(f"UnsupportedBinding: {excp}")
330330
return resp(self.environ, self.start_response)
331331

332332
if not _resp:
@@ -349,7 +349,7 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None, **kwargs):
349349
)
350350
except Exception as excp:
351351
logging.error(exception_trace(excp))
352-
resp = ServiceError("Exception: {}".format(excp))
352+
resp = ServiceError(f"Exception: {excp}")
353353
return resp(self.environ, self.start_response)
354354

355355
logger.info("AuthNResponse: %s", _resp)
@@ -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)
@@ -1109,7 +1109,7 @@ def application(environ, start_response):
11091109
SRV.ssl_adapter = BuiltinSSLAdapter(CONFIG.SERVER_CERT, CONFIG.SERVER_KEY, CONFIG.CERT_CHAIN)
11101110

11111111
logger.info("Server starting")
1112-
print("IDP listening on {}:{}{}".format(HOST, PORT, _https))
1112+
print(f"IDP listening on {HOST}:{PORT}{_https}")
11131113
try:
11141114
SRV.start()
11151115
except KeyboardInterrupt:

‎example/idp2/idp_uwsgi.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None):
276276
resp_args, _resp = self.verify_request(query, binding_in)
277277
except UnknownPrincipal as excp:
278278
logger.error("UnknownPrincipal: %s", excp)
279-
resp = ServiceError("UnknownPrincipal: {}".format(excp))
279+
resp = ServiceError(f"UnknownPrincipal: {excp}")
280280
return resp(self.environ, self.start_response)
281281
except UnsupportedBinding as excp:
282282
logger.error("UnsupportedBinding: %s", excp)
283-
resp = ServiceError("UnsupportedBinding: {}".format(excp))
283+
resp = ServiceError(f"UnsupportedBinding: {excp}")
284284
return resp(self.environ, self.start_response)
285285

286286
if not _resp:
@@ -301,7 +301,7 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None):
301301
_resp = IDP.create_authn_response(identity, userid=self.user, encrypt_cert=encrypt_cert, **resp_args)
302302
except Exception as excp:
303303
logging.error(exception_trace(excp))
304-
resp = ServiceError("Exception: {}".format(excp))
304+
resp = ServiceError(f"Exception: {excp}")
305305
return resp(self.environ, self.start_response)
306306

307307
logger.info("AuthNResponse: %s", _resp)
@@ -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 = {}
@@ -985,7 +985,7 @@ def application(environ, start_response):
985985
PORT = CONFIG.PORT
986986

987987
SRV = make_server(HOST, PORT, application)
988-
print("IdP listening on {}:{}".format(HOST, PORT))
988+
print(f"IdP listening on {HOST}:{PORT}")
989989
SRV.serve_forever()
990990
else:
991991
_rot = args.mako_root

0 commit comments

Comments
 (0)