Replace response mimetype with content_type

p1c2u · p1c2u · commit 2a3bd965db0c · 2023-10-21T18:30:40.000Z
diff --git a/openapi_core/contrib/aiohttp/responses.py b/openapi_core/contrib/aiohttp/responses.py
@@ -26,7 +26,7 @@ def status_code(self) -> int:
         return self.response.status
 
     @property
-    def mimetype(self) -> str:
+    def content_type(self) -> str:
         return self.response.content_type or ""
 
     @property
diff --git a/openapi_core/contrib/django/responses.py b/openapi_core/contrib/django/responses.py
@@ -26,7 +26,7 @@ def headers(self) -> Headers:
         return Headers(self.response.headers.items())
 
     @property
-    def mimetype(self) -> str:
+    def content_type(self) -> str:
         content_type = self.response.get("Content-Type", "")
         assert isinstance(content_type, str)
         return content_type
diff --git a/openapi_core/contrib/falcon/responses.py b/openapi_core/contrib/falcon/responses.py
@@ -21,13 +21,13 @@ def status_code(self) -> int:
         return int(self.response.status[:3])
 
     @property
-    def mimetype(self) -> str:
-        mimetype = ""
+    def content_type(self) -> str:
+        content_type = ""
         if self.response.content_type:
-            mimetype = self.response.content_type.partition(";")[0]
+            content_type = self.response.content_type
         else:
-            mimetype = self.response.options.default_media_type
-        return mimetype
+            content_type = self.response.options.default_media_type
+        return content_type
 
     @property
     def headers(self) -> Headers:
diff --git a/openapi_core/contrib/requests/responses.py b/openapi_core/contrib/requests/responses.py
@@ -19,7 +19,7 @@ def status_code(self) -> int:
         return int(self.response.status_code)
 
     @property
-    def mimetype(self) -> str:
+    def content_type(self) -> str:
         return str(self.response.headers.get("Content-Type", ""))
 
     @property
diff --git a/openapi_core/contrib/starlette/responses.py b/openapi_core/contrib/starlette/responses.py
@@ -21,8 +21,8 @@ def status_code(self) -> int:
         return self.response.status_code
 
     @property
-    def mimetype(self) -> str:
-        return self.response.media_type or ""
+    def content_type(self) -> str:
+        return self.response.headers.get("Content-Type") or ""
 
     @property
     def headers(self) -> Headers:
diff --git a/openapi_core/contrib/werkzeug/responses.py b/openapi_core/contrib/werkzeug/responses.py
@@ -18,7 +18,7 @@ def status_code(self) -> int:
         return self.response._status_code
 
     @property
-    def mimetype(self) -> str:
+    def content_type(self) -> str:
         return str(self.response.mimetype)
 
     @property
diff --git a/openapi_core/protocols.py b/openapi_core/protocols.py
@@ -115,8 +115,8 @@ class Response(Protocol):
             The status code as integer.
         headers
             Response headers as Headers.
-        mimetype
-            Lowercase content type without charset.
+        content_type
+            The content type with parameters and always lowercase.
     """
 
     @property
@@ -128,7 +128,7 @@ def status_code(self) -> int:
         ...
 
     @property
-    def mimetype(self) -> str:
+    def content_type(self) -> str:
         ...
 
     @property
diff --git a/openapi_core/testing/responses.py b/openapi_core/testing/responses.py
@@ -12,9 +12,9 @@ def __init__(
         data: str,
         status_code: int = 200,
         headers: Optional[Dict[str, Any]] = None,
-        mimetype: str = "application/json",
+        content_type: str = "application/json",
     ):
         self.data = data
         self.status_code = status_code
         self.headers = Headers(headers or {})
-        self.mimetype = mimetype
+        self.content_type = content_type
diff --git a/openapi_core/unmarshalling/response/unmarshallers.py b/openapi_core/unmarshalling/response/unmarshallers.py
@@ -66,7 +66,7 @@ def _unmarshal(
 
         try:
             validated_data = self._get_data(
-                response.data, response.mimetype, operation_response
+                response.data, response.content_type, operation_response
             )
         except DataValidationError as exc:
             validated_data = None
@@ -106,7 +106,7 @@ def _unmarshal_data(
 
         try:
             validated = self._get_data(
-                response.data, response.mimetype, operation_response
+                response.data, response.content_type, operation_response
             )
         except DataValidationError as exc:
             validated = None
diff --git a/openapi_core/validation/response/validators.py b/openapi_core/validation/response/validators.py
@@ -234,7 +234,10 @@ def iter_errors(
             return
 
         yield from self._iter_data_errors(
-            response.status_code, response.data, response.mimetype, operation
+            response.status_code,
+            response.data,
+            response.content_type,
+            operation,
         )
 
 
@@ -273,7 +276,7 @@ def iter_errors(
             response.status_code,
             response.data,
             response.headers,
-            response.mimetype,
+            response.content_type,
             operation,
         )
 
@@ -292,7 +295,10 @@ def iter_errors(
             return
 
         yield from self._iter_data_errors(
-            response.status_code, response.data, response.mimetype, operation
+            response.status_code,
+            response.data,
+            response.content_type,
+            operation,
         )
 
 
@@ -331,7 +337,7 @@ def iter_errors(
             response.status_code,
             response.data,
             response.headers,
-            response.mimetype,
+            response.content_type,
             operation,
         )
 
diff --git a/tests/integration/test_petstore.py b/tests/integration/test_petstore.py
@@ -195,7 +195,7 @@ def test_get_pets_response(self, spec):
         assert response_result.data.data[0].id == 1
         assert response_result.data.data[0].name == "Cat"
 
-    def test_get_pets_response_no_schema(self, spec):
+    def test_get_pets_response_media_type(self, spec):
         host_url = "http://petstore.swagger.io/v1"
         path_pattern = "/v1/pets"
         query_params = {
@@ -230,15 +230,15 @@ def test_get_pets_response_no_schema(self, spec):
 
         assert result.body is None
 
-        data = b"<html></html>"
+        data = b"<html>\xb1\xbc</html>"
         response = MockResponse(
-            data, status_code=404, mimetype="text/html; charset=utf-8"
+            data, status_code=404, content_type="text/html; charset=iso-8859-2"
         )
 
         response_result = unmarshal_response(request, response, spec=spec)
 
         assert response_result.errors == []
-        assert response_result.data == data.decode("utf-8")
+        assert response_result.data == data.decode("iso-8859-2")
 
     def test_get_pets_invalid_response(self, spec, response_unmarshaller):
         host_url = "http://petstore.swagger.io/v1"
@@ -1372,7 +1372,7 @@ def test_get_pet_wildcard(self, spec):
         assert result.body is None
 
         data = b"imagedata"
-        response = MockResponse(data, mimetype="image/png")
+        response = MockResponse(data, content_type="image/png")
 
         response_result = unmarshal_response(request, response, spec=spec)
 
diff --git a/tests/integration/unmarshalling/test_response_unmarshaller.py b/tests/integration/unmarshalling/test_response_unmarshaller.py
@@ -72,7 +72,7 @@ def test_invalid_response(self, response_unmarshaller):
 
     def test_invalid_content_type(self, response_unmarshaller):
         request = MockRequest(self.host_url, "get", "/v1/pets")
-        response = MockResponse("Not Found", mimetype="text/csv")
+        response = MockResponse("Not Found", content_type="text/csv")
 
         result = response_unmarshaller.unmarshal(request, response)
 
diff --git a/tests/integration/validation/test_response_validators.py b/tests/integration/validation/test_response_validators.py
@@ -61,7 +61,7 @@ def test_invalid_response(self, response_validator):
 
     def test_invalid_content_type(self, response_validator):
         request = MockRequest(self.host_url, "get", "/v1/pets")
-        response = MockResponse("Not Found", mimetype="text/csv")
+        response = MockResponse("Not Found", content_type="text/csv")
 
         with pytest.raises(DataValidationError) as exc_info:
             response_validator.validate(request, response)
diff --git a/tests/unit/contrib/django/test_django.py b/tests/unit/contrib/django/test_django.py
@@ -184,7 +184,7 @@ def test_stream_response(self, response_factory):
 
         assert openapi_response.data == "foo\nbar\nbaz\n"
         assert openapi_response.status_code == response.status_code
-        assert openapi_response.mimetype == response["Content-Type"]
+        assert openapi_response.content_type == response["Content-Type"]
 
     def test_redirect_response(self, response_factory):
         data = "/redirected/"
@@ -194,4 +194,4 @@ def test_redirect_response(self, response_factory):
 
         assert openapi_response.data == data
         assert openapi_response.status_code == response.status_code
-        assert openapi_response.mimetype == response["Content-Type"]
+        assert openapi_response.content_type == response["Content-Type"]
diff --git a/tests/unit/contrib/flask/test_flask_responses.py b/tests/unit/contrib/flask/test_flask_responses.py
@@ -17,4 +17,4 @@ def test_invalid_server(self, response_factory):
 
         assert openapi_response.data == data
         assert openapi_response.status_code == status_code
-        assert openapi_response.mimetype == response.mimetype
+        assert openapi_response.content_type == response.mimetype
diff --git a/tests/unit/contrib/requests/test_requests_responses.py b/tests/unit/contrib/requests/test_requests_responses.py
@@ -18,4 +18,4 @@ def test_invalid_server(self, response_factory):
         assert openapi_response.data == data
         assert openapi_response.status_code == status_code
         mimetype = response.headers.get("Content-Type")
-        assert openapi_response.mimetype == mimetype
+        assert openapi_response.content_type == mimetype
