Skip to content

Commit e98babf

Browse files
committed
media type finder find sig refactor
1 parent a33d8e7 commit e98babf

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

openapi_core/templating/media_types/finders.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ class MediaTypeFinder:
88
def __init__(self, content):
99
self.content = content
1010

11-
def find(self, request):
12-
if request.mimetype in self.content:
13-
return self.content / request.mimetype, request.mimetype
11+
def find(self, mimetype):
12+
if mimetype in self.content:
13+
return self.content / mimetype, mimetype
1414

15-
if request.mimetype:
15+
if mimetype:
1616
for key, value in self.content.items():
17-
if fnmatch.fnmatch(request.mimetype, key):
17+
if fnmatch.fnmatch(mimetype, key):
1818
return value, key
1919

20-
raise MediaTypeNotFound(request.mimetype, list(self.content.keys()))
20+
raise MediaTypeNotFound(mimetype, list(self.content.keys()))

openapi_core/validation/request/validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def _get_body(self, request, operation):
139139

140140
try:
141141
media_type, mimetype = self._get_media_type(
142-
request_body / "content", request
142+
request_body / "content", request.mimetype
143143
)
144144
except MediaTypeFinderError as exc:
145145
return None, [exc]

openapi_core/validation/response/validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def _get_data(self, response, operation_response):
4848

4949
try:
5050
media_type, mimetype = self._get_media_type(
51-
operation_response / "content", response
51+
operation_response / "content", response.mimetype
5252
)
5353
except MediaTypeFinderError as exc:
5454
return None, [exc]

openapi_core/validation/validators.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ def schema_unmarshallers_factory(self):
5151
def _find_path(self, request):
5252
return self.path_finder.find(request)
5353

54-
def _get_media_type(self, content, request_or_response):
54+
def _get_media_type(self, content, mimetype):
5555
from openapi_core.templating.media_types.finders import MediaTypeFinder
5656

5757
finder = MediaTypeFinder(content)
58-
return finder.find(request_or_response)
58+
return finder.find(mimetype)
5959

6060
def _deserialise_data(self, mimetype, value):
6161
deserializer = self.media_type_deserializers_factory.create(mimetype)

0 commit comments

Comments
 (0)