|
20 | 20 |
|
21 | 21 | __title__ = "Sane Scanner Web Server" |
22 | 22 | __author__ = "CoolCat467" |
23 | | -__version__ = "2.1.3" |
| 23 | +__version__ = "2.1.4" |
24 | 24 | __license__ = "GPLv3" |
25 | 25 |
|
26 | 26 |
|
|
41 | 41 | import trio |
42 | 42 | from hypercorn.config import Config |
43 | 43 | 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 |
46 | 45 | from quart.templating import stream_template |
47 | 46 | from quart_trio import QuartTrio |
48 | 47 | from werkzeug import Response as WerkzeugResponse |
@@ -130,35 +129,7 @@ def as_argument(self) -> str: |
130 | 129 | return f"--{self.name}={self.set if self.set is not None else self.default}" |
131 | 130 |
|
132 | 131 |
|
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 |
162 | 133 | __name__, |
163 | 134 | static_folder="static", |
164 | 135 | template_folder="templates", |
|
0 commit comments