From 323bf727c7e3f94df83e97849b4f8ee84597ad04 Mon Sep 17 00:00:00 2001 From: JamesParrott <80779630+JamesParrott@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:56:21 +0000 Subject: [PATCH 1/4] Let Quart.default_config take all k/v pairs from flask.app.Flask.default_config, then override them --- src/quart/app.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/quart/app.py b/src/quart/app.py index c14d30b..477f623 100644 --- a/src/quart/app.py +++ b/src/quart/app.py @@ -28,6 +28,7 @@ from aiofiles import open as async_open from aiofiles.base import AiofilesContextManager +import flask.app from flask.sansio.app import App from flask.sansio.scaffold import setupmethod from hypercorn.asyncio import serve @@ -235,7 +236,8 @@ class Quart(App): websocket_class = Websocket default_config = ImmutableDict( - { + flask.app.Flask.default_config + | { "APPLICATION_ROOT": "/", "BACKGROUND_TASK_SHUTDOWN_TIMEOUT": 5, # Second "BODY_TIMEOUT": 60, # Second From 9c62bf21844c18d1785bb3529cf0dce506f0ff71 Mon Sep 17 00:00:00 2001 From: JamesParrott <80779630+JamesParrott@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:59:56 +0000 Subject: [PATCH 2/4] Run isort --- src/quart/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quart/app.py b/src/quart/app.py index 477f623..cd37601 100644 --- a/src/quart/app.py +++ b/src/quart/app.py @@ -26,9 +26,9 @@ ) from urllib.parse import quote +import flask.app from aiofiles import open as async_open from aiofiles.base import AiofilesContextManager -import flask.app from flask.sansio.app import App from flask.sansio.scaffold import setupmethod from hypercorn.asyncio import serve From aa5001ed3660ab6a7d46115f6d6124e16366c631 Mon Sep 17 00:00:00 2001 From: JamesParrott <80779630+JamesParrott@users.noreply.github.com> Date: Fri, 15 Nov 2024 13:38:30 +0000 Subject: [PATCH 3/4] Add Flask to app.py namespace, (adjust import style to from flask.app import Flask). --- src/quart/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/quart/app.py b/src/quart/app.py index cd37601..5a8805e 100644 --- a/src/quart/app.py +++ b/src/quart/app.py @@ -26,7 +26,7 @@ ) from urllib.parse import quote -import flask.app +from flask.app import Flask from aiofiles import open as async_open from aiofiles.base import AiofilesContextManager from flask.sansio.app import App @@ -236,7 +236,7 @@ class Quart(App): websocket_class = Websocket default_config = ImmutableDict( - flask.app.Flask.default_config + Flask.default_config | { "APPLICATION_ROOT": "/", "BACKGROUND_TASK_SHUTDOWN_TIMEOUT": 5, # Second From 9c7973c32b6c87fb86e254dab7fab97b9cd6e461 Mon Sep 17 00:00:00 2001 From: JamesParrott <80779630+JamesParrott@users.noreply.github.com> Date: Fri, 15 Nov 2024 13:53:01 +0000 Subject: [PATCH 4/4] Run isort --- src/quart/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quart/app.py b/src/quart/app.py index 5a8805e..7283059 100644 --- a/src/quart/app.py +++ b/src/quart/app.py @@ -26,9 +26,9 @@ ) from urllib.parse import quote -from flask.app import Flask from aiofiles import open as async_open from aiofiles.base import AiofilesContextManager +from flask.app import Flask from flask.sansio.app import App from flask.sansio.scaffold import setupmethod from hypercorn.asyncio import serve