From c3fd0f944f3215ced2e51782ea9e2ff44107f746 Mon Sep 17 00:00:00 2001
From: Martin van Es <martin@mrvanes.com>
Date: Mon, 28 Feb 2022 12:39:51 +0100
Subject: [PATCH] Some minor code formatting cleanup
---
mdproxy.py | 10 ++++++----
mdserver.py | 12 ++++++++----
utils.py | 4 ++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/mdproxy.py b/mdproxy.py
index 4d78f0a..a8f1e93 100755
--- a/mdproxy.py
+++ b/mdproxy.py
@@ -46,10 +46,12 @@ def serve_all(realm):
request = requests.get(f"{config[realm]['signer']}/{realm}"
f"/entities")
data = request.text
- last_modified = request.headers.get('Last-Modified',
- formatdate(timeval=None,
- localtime=False,
- usegmt=True))
+ last_modified = request.headers.get(
+ 'Last-Modified',
+ formatdate(timeval=None,
+ localtime=False,
+ usegmt=True)
+ )
try:
root = ET.fromstring(data)
diff --git a/mdserver.py b/mdserver.py
index b40704d..f76b9d8 100755
--- a/mdserver.py
+++ b/mdserver.py
@@ -30,8 +30,10 @@ def serve_all(realm):
datetime.now(tz.tzutc())).total_seconds())
response.headers['Cache-Control'] = f"max-age={max_age}"
- response.headers['Last-Modified'] = formatdate(timeval=mktime(data.last_modified.timetuple()),
- localtime=False, usegmt=True)
+ response.headers['Last-Modified'] = formatdate(
+ timeval=mktime(data.last_modified.timetuple()),
+ localtime=False,
+ usegmt=True)
return response
@@ -57,8 +59,10 @@ def serve_one(realm, entity_id):
last_modified = datetime.now(tz.tzutc())
response.headers['Cache-Control'] = f"max-age={max_age}"
- response.headers['Last-Modified'] = formatdate(timeval=mktime(last_modified.timetuple()),
- localtime=False, usegmt=True)
+ response.headers['Last-Modified'] = formatdate(
+ timeval=mktime(last_modified.timetuple()),
+ localtime=False,
+ usegmt=True)
return response
diff --git a/utils.py b/utils.py
index 9fce5a5..b523990 100755
--- a/utils.py
+++ b/utils.py
@@ -192,10 +192,10 @@ class Realm:
data = Entity()
ns = NSMAP
root = ET.Element(f"{{{MD_NAMESPACE}}}EntitiesDescriptor",
- nsmap=ns)
+ nsmap=ns)
# We are going to minimize expires, so set to some inf value
valid_until = (datetime.now(tz.tzutc()) +
- timedelta(days=365))
+ timedelta(days=365))
cache_duration = parse_duration("P1D")
for sha1, entity in self.idps.items():
valid_until = min(valid_until, entity.valid_until)
--
GitLab