From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 16 Mar 2024 23:36:22 +0000 (+0100)
Subject: Display HandledException as HTML message with appropriate status code.
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/test?a=commitdiff_plain;h=7c7602eae676c9806292ad37c58d22dcce12a14f;p=taskplom
Display HandledException as HTML message with appropriate status code.
---
diff --git a/task.py b/task.py
index 0b88254..3af1cac 100755
--- a/task.py
+++ b/task.py
@@ -18,22 +18,29 @@ class HandledException(Exception):
class TaskHandler(BaseHTTPRequestHandler):
"""Handles single HTTP request."""
- def do_GET(self):
- """Handle any GET request."""
- parsed_url = urlparse(self.path)
- site = path_split(parsed_url.path)[1]
- if 'calendar' == site:
- html = self.do_GET_calendar()
- else:
- html = self.do_GET_msg('I have nothing to say at this point.')
- self.send_response(200)
+ def send_html(self, html, code=200):
+ """Send HTML as proper HTTP response."""
+ self.send_response(code)
self.end_headers()
self.wfile.write(bytes(html, 'utf-8'))
- def do_GET_msg(self, msg):
- """Show message."""
- return self.server.jinja.get_template('msg.html').render(
- msg=msg)
+ def send_msg(self, msg, code=400):
+ """Send message in HTML formatting as HTTP response."""
+ html = self.server.jinja.get_template('msg.html').render(msg=msg)
+ self.send_html(html, code)
+
+ def do_GET(self):
+ """Handle any GET request."""
+ try:
+ parsed_url = urlparse(self.path)
+ site = path_split(parsed_url.path)[1]
+ if 'calendar' == site:
+ html = self.do_GET_calendar()
+ else:
+ raise HandledException('Test!')
+ self.send_html(html)
+ except HandledException as error:
+ self.send_msg(error)
def do_GET_calendar(self):
"""Show sorted Days."""
diff --git a/templates/base.html b/templates/base.html
index 427740b..a3975e4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,7 +2,7 @@
<html>
<meta charset="UTF-8">
<body>
-<a href="calendar">calendar</a> | <a href="test">test</a>
+<a href="calendar">calendar</a> | <a href="error">error</a>
<hr>
{% block content %}
{% endblock %}