From fb8b6b2311674c71ae12294cec5d9e6b30dc4258 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 3 Nov 2022 16:36:43 -0700 Subject: [PATCH] Refactor _error helper function --- datasette/views/base.py | 4 ++++ datasette/views/row.py | 6 +----- datasette/views/table.py | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/datasette/views/base.py b/datasette/views/base.py index e12677c0..b30f3eb5 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -546,3 +546,7 @@ class DataView(BaseView): if self.ds.cors: add_cors_headers(response.headers) return response + + +def _error(messages, status=400): + return Response.json({"ok": False, "errors": messages}, status=status) diff --git a/datasette/views/row.py b/datasette/views/row.py index 2fdbb251..9406d58c 100644 --- a/datasette/views/row.py +++ b/datasette/views/row.py @@ -1,6 +1,6 @@ from datasette.utils.asgi import NotFound, Forbidden, Response from datasette.database import QueryInterrupted -from .base import DataView, BaseView +from .base import DataView, BaseView, _error from datasette.utils import ( tilde_decode, urlsafe_components, @@ -11,10 +11,6 @@ import sqlite_utils from .table import _sql_params_pks, display_columns_and_rows -def _error(messages, status=400): - return Response.json({"ok": False, "errors": messages}, status=status) - - class RowView(DataView): name = "row" diff --git a/datasette/views/table.py b/datasette/views/table.py index 61227206..7f3c3762 100644 --- a/datasette/views/table.py +++ b/datasette/views/table.py @@ -31,7 +31,7 @@ from datasette.utils import ( from datasette.utils.asgi import BadRequest, Forbidden, NotFound, Response from datasette.filters import Filters import sqlite_utils -from .base import BaseView, DataView, DatasetteError, ureg +from .base import BaseView, DataView, DatasetteError, ureg, _error from .database import QueryView LINK_WITH_LABEL = ( @@ -40,10 +40,6 @@ LINK_WITH_LABEL = ( LINK_WITH_VALUE = '{id}' -def _error(messages, status=400): - return Response.json({"ok": False, "errors": messages}, status=status) - - class Row: def __init__(self, cells): self.cells = cells