More media types supported

python-openapi · Jul 19, 2023 · 0232e05 · 0232e05
1 parent efdc5be
commit 0232e05
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/openapi_core/deserializing/media_types/__init__.py b/openapi_core/deserializing/media_types/__init__.py
@@ -1,4 +1,5 @@
-from json import loads
+from json import loads as json_loads
+from xml.etree.ElementTree import fromstring as xml_loads
 
 from openapi_core.deserializing.media_types.datatypes import (
     MediaTypeDeserializersDict,
@@ -7,12 +8,18 @@
     MediaTypeDeserializersFactory,
 )
 from openapi_core.deserializing.media_types.util import data_form_loads
+from openapi_core.deserializing.media_types.util import plain_loads
 from openapi_core.deserializing.media_types.util import urlencoded_form_loads
 
 __all__ = ["media_type_deserializers_factory"]
 
 media_type_deserializers: MediaTypeDeserializersDict = {
-    "application/json": loads,
+    "text/html": plain_loads,
+    "text/plain": plain_loads,
+    "application/json": json_loads,
+    "application/vnd.api+json": json_loads,
+    "application/xml": xml_loads,
+    "application/xhtml+xml": xml_loads,
     "application/x-www-form-urlencoded": urlencoded_form_loads,
     "multipart/form-data": data_form_loads,
 }

diff --git a/openapi_core/deserializing/media_types/util.py b/openapi_core/deserializing/media_types/util.py
@@ -5,6 +5,12 @@
 from urllib.parse import parse_qsl
 
 
+def plain_loads(value: Union[str, bytes]) -> str:
+    if isinstance(value, bytes):
+        value = value.decode("ASCII", errors="surrogateescape")
+    return value
+
+
 def urlencoded_form_loads(value: Any) -> Dict[str, Any]:
     return dict(parse_qsl(value))