Skip to content

Commit 9e806ab

Browse files
committed
Update quart-trio and remove temporary shim code because quart-trio was outdated
1 parent ce24f4b commit 9e806ab

File tree

2 files changed

+8
-37
lines changed

2 files changed

+8
-37
lines changed

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "sanescansrv"
7-
version = "2.1.3"
7+
version = "2.1.4"
88
authors = [
99
{ name="CoolCat467" },
1010
]
@@ -23,11 +23,11 @@ classifiers = [
2323
]
2424
keywords = ["scanner", "sane", "server", "frontend"]
2525
dependencies = [
26-
"hypercorn[trio]~=0.14.3",
27-
"Pillow~=10.0.0",
26+
"hypercorn[trio]~=0.14.4",
27+
"Pillow~=10.0.1",
2828
"python-sane~=2.9.1",
29-
"quart~=0.19.2",
30-
"quart-trio~=0.10.0",
29+
"quart~=0.19.3",
30+
"quart-trio~=0.11.0",
3131
"trio~=0.22.0",
3232
"Werkzeug~=3.0.0"
3333
]

src/sanescansrv/server.py

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
__title__ = "Sane Scanner Web Server"
2222
__author__ = "CoolCat467"
23-
__version__ = "2.1.3"
23+
__version__ = "2.1.4"
2424
__license__ = "GPLv3"
2525

2626

@@ -41,8 +41,7 @@
4141
import trio
4242
from hypercorn.config import Config
4343
from hypercorn.trio import serve
44-
from quart import Response, request, request_started
45-
from quart.ctx import RequestContext
44+
from quart import Response, request
4645
from quart.templating import stream_template
4746
from quart_trio import QuartTrio
4847
from werkzeug import Response as WerkzeugResponse
@@ -130,35 +129,7 @@ def as_argument(self) -> str:
130129
return f"--{self.name}={self.set if self.set is not None else self.default}"
131130

132131

133-
class HopefullyTemporarySubclass(QuartTrio):
134-
"""Hopefully Temporary Subclass of QuartTrio with patched code because QuartTrio is out of date."""
135-
136-
__slots__ = ()
137-
138-
async def full_dispatch_request(
139-
self,
140-
request_context: RequestContext | None = None,
141-
) -> Response | WerkzeugResponse:
142-
"""Adds pre and post processing to the request dispatching.
143-
144-
Arguments:
145-
---------
146-
request_context: The request context, optional as Flask
147-
omits this argument.
148-
"""
149-
# await self.try_trigger_before_first_request_functions()
150-
# await request_started.send(self)
151-
await request_started.send_async(self, _sync_wrapper=self.ensure_async)
152-
try:
153-
result = await self.preprocess_request(request_context)
154-
if result is None:
155-
result = await self.dispatch_request(request_context)
156-
except (Exception, trio.MultiError) as error:
157-
result = await self.handle_user_exception(error) # type: ignore[assignment]
158-
return await self.finalize_request(result, request_context) # type: ignore[arg-type]
159-
160-
161-
app: Final = HopefullyTemporarySubclass( # pylint: disable=invalid-name
132+
app: Final = QuartTrio( # pylint: disable=invalid-name
162133
__name__,
163134
static_folder="static",
164135
template_folder="templates",

0 commit comments

Comments
 (0)