Display HandledException as HTML message with appropriate status code.

[plomtask] / task.py

diff --git a/task.py b/task.py
index 0b8825476353fff066f4b5480c7fcbf2d5ef00b5..3af1cacadc4c30700ef18c748ff81ee9f9a01ed2 100755 (executable)
--- 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."""