Skip to content

Commit b66277b

Browse files
committed
fix conflict
1 parent 2b65877 commit b66277b

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

litestar/handlers/http_handlers/base.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
from litestar._layers.utils import narrow_response_cookies, narrow_response_headers
99
from litestar.connection import Request
10+
from litestar.datastructures import CacheControlHeader, ETag, FormMultiDict
1011
from litestar.datastructures.cookie import Cookie
1112
from litestar.datastructures.response_header import ResponseHeader
1213
from litestar.enums import HttpMethod, MediaType
@@ -18,7 +19,6 @@
1819
)
1920
from litestar.handlers.base import BaseRouteHandler
2021
from litestar.handlers.http_handlers._utils import (
21-
cleanup_temporary_files,
2222
create_data_handler,
2323
create_generic_asgi_response_handler,
2424
create_response_handler,
@@ -65,7 +65,6 @@
6565
from litestar.app import Litestar
6666
from litestar.background_tasks import BackgroundTask, BackgroundTasks
6767
from litestar.config.response_cache import CACHE_FOREVER
68-
from litestar.datastructures import CacheControlHeader, ETag
6968
from litestar.dto import AbstractDTO
7069
from litestar.openapi.datastructures import ResponseSpec
7170
from litestar.openapi.spec import SecurityRequirement
@@ -683,7 +682,7 @@ async def handle(self, connection: Request[Any, Any, Any]) -> None:
683682
await after_response_handler(connection)
684683
finally:
685684
if (form_data := ScopeState.from_scope(connection.scope).form) is not Empty:
686-
await cleanup_temporary_files(form_data=cast("dict[str, Any]", form_data))
685+
await FormMultiDict.from_form_data(form_data).close()
687686

688687
async def _get_response_for_request(
689688
self,

litestar/routes/http.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
from __future__ import annotations
22

3-
from typing import Iterable
4-
from typing import TYPE_CHECKING, Any
3+
from typing import TYPE_CHECKING, Iterable
54

6-
from msgspec.msgpack import decode as _decode_msgpack_plain
7-
8-
from litestar.enums import HttpMethod, MediaType
9-
from litestar.exceptions import ClientException, ImproperlyConfiguredException, SerializationException
10-
from litestar.response import Response
5+
from litestar.exceptions import ImproperlyConfiguredException
116
from litestar.routes.base import BaseRoute
127
from litestar.types import HTTPScope
138

0 commit comments

Comments
 (0)