github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support non-async view functions, closes #867

Browse source
This commit is contained in:
Simon Willison 2020-06-27 11:30:34 -07:00
commit 4b142862f2
4 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
datasette/app.py
View file

@ -3,6 +3,7 @@ import asgi_csrf
import collections
import datetime
import hashlib
import inspect
import itertools
import json
import os
@ -40,6 +41,7 @@ from .database import Database, QueryInterrupted
from .utils import (
async_call_with_supported_arguments,
call_with_supported_arguments,
escape_css_string,
escape_sqlite,
format_bytes,
@ -1056,14 +1058,24 @@ def _cleaner_task_str(task):
def wrap_view(view_fn, datasette):
async def asgi_view_fn(scope, receive, send):
response = await async_call_with_supported_arguments(
view_fn,
scope=scope,
receive=receive,
send=send,
request=Request(scope, receive),
datasette=datasette,
)
if inspect.iscoroutinefunction(view_fn):
response = await async_call_with_supported_arguments(
view_fn,
scope=scope,
receive=receive,
send=send,
request=Request(scope, receive),
datasette=datasette,
)
else:
response = call_with_supported_arguments(
view_fn,
scope=scope,
receive=receive,
send=send,
request=Request(scope, receive),
datasette=datasette,
)
if response is not None:
await response.asgi_send(send)