From 3c4d4f35351b1691993984503a6380d2fc635681 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sun, 23 Jun 2019 15:28:14 -0700 Subject: [PATCH] Replaced sanic.exceptions.NotFound --- datasette/app.py | 2 +- datasette/utils/asgi.py | 4 ++++ datasette/views/base.py | 3 +-- datasette/views/table.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/datasette/app.py b/datasette/app.py index 978fb7e7..9debfa1e 100644 --- a/datasette/app.py +++ b/datasette/app.py @@ -12,7 +12,6 @@ from pathlib import Path import click from markupsafe import Markup from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader -from sanic.exceptions import NotFound from .views.base import DatasetteError, ureg, AsgiRouter from .views.database import DatabaseDownload, DatabaseView @@ -35,6 +34,7 @@ from .utils import ( ) from .utils.asgi import ( AsgiLifespan, + NotFound, asgi_static, asgi_send, asgi_send_html, diff --git a/datasette/utils/asgi.py b/datasette/utils/asgi.py index 1cbdd583..56a7a79a 100644 --- a/datasette/utils/asgi.py +++ b/datasette/utils/asgi.py @@ -7,6 +7,10 @@ import re import aiofiles +class NotFound(Exception): + pass + + class AsgiRouter: def __init__(self, routes=None): routes = routes or [] diff --git a/datasette/views/base.py b/datasette/views/base.py index 8d514688..69a17315 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -8,7 +8,6 @@ import urllib import jinja2 import pint from sanic import response -from sanic.exceptions import NotFound from html import escape @@ -27,7 +26,7 @@ from datasette.utils import ( sqlite3, to_css_class, ) -from datasette.utils.asgi import AsgiStream, AsgiWriter, AsgiRouter, AsgiView +from datasette.utils.asgi import AsgiStream, AsgiWriter, AsgiRouter, AsgiView, NotFound ureg = pint.UnitRegistry() diff --git a/datasette/views/table.py b/datasette/views/table.py index b5765ca4..06be5671 100644 --- a/datasette/views/table.py +++ b/datasette/views/table.py @@ -3,7 +3,6 @@ import itertools import json import jinja2 -from sanic.exceptions import NotFound from datasette.plugins import pm from datasette.utils import ( @@ -24,6 +23,7 @@ from datasette.utils import ( urlsafe_components, value_as_boolean, ) +from datasette.utils.asgi import NotFound from datasette.filters import Filters from .base import DataView, DatasetteError, ureg