X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=af1a60cd148ec86a83bf27bad8759a7e1cf74e6f;hb=8ae8877e3e2588db76285e7e3ddfb8c7b9948a96;hp=ddea087cb38fae73c713da589ef901925141cc5e;hpb=3558a14701955de18ae7adbda0e93aaee7710a92;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index ddea087..af1a60c 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -6,7 +6,7 @@ from urllib.parse import urlparse, parse_qs from os.path import split as path_split from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader from plomtask.days import Day, todays_date -from plomtask.misc import HandledException +from plomtask.exceptions import HandledException, BadFormatException from plomtask.db import DatabaseConnection, DatabaseFile from plomtask.processes import Process @@ -43,7 +43,7 @@ class TaskHandler(BaseHTTPRequestHandler): try: id__ = int(id_) if id_ else None except ValueError as e: - raise HandledException(f'Bad ?id= value: {id_}') from e + raise BadFormatException(f'Bad ?id= value: {id_}') from e html = self.do_GET_process(conn, id__) elif 'processes' == site: html = self.do_GET_processes(conn) @@ -53,7 +53,7 @@ class TaskHandler(BaseHTTPRequestHandler): conn.close() self._send_html(html) except HandledException as error: - self._send_msg(error) + self._send_msg(error, code=error.http_code) def do_GET_calendar(self, conn: DatabaseConnection, start: str, end: str) -> str: @@ -92,13 +92,13 @@ class TaskHandler(BaseHTTPRequestHandler): try: id__ = int(id_) if id_ else None except ValueError as e: - raise HandledException(f'Bad ?id= value: {id_}') from e + raise BadFormatException(f'Bad ?id= value: {id_}') from e self.do_POST_process(conn, id__, postvars) conn.commit() conn.close() self._redirect('/') except HandledException as error: - self._send_msg(error) + self._send_msg(error, code=error.http_code) def do_POST_day(self, conn: DatabaseConnection, date: str, postvars: dict[str, list[str]]) -> None: @@ -117,7 +117,7 @@ class TaskHandler(BaseHTTPRequestHandler): try: process.effort.set(float(effort)) except ValueError as e: - raise HandledException(f'Bad effort value: {effort}') from e + raise BadFormatException(f'Bad effort value: {effort}') from e process.save(conn) def _init_handling(self) -> \