Merge branch 'master' into fix_727

Author: markstory

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @markstory @iamrajjoshi

CHANGES

@@ -1,6 +1,7 @@
-Unreleased
-----------
+0.25.8
+------
 
+* Fix bug where the content type is always recorded as either text/plain or application/json. See #770
 * Allow asserts on add_callback() matches. See #727
 
 0.25.7

responses/__init__.py

@@ -990,20 +990,19 @@ def __enter__(self) -> "RequestsMock":
         self.start()
         return self
 
-    def __exit__(self, type: Any, value: Any, traceback: Any) -> bool:
+    def __exit__(self, type: Any, value: Any, traceback: Any) -> None:
         success = type is None
         try:
             self.stop(allow_assert=success)
         finally:
             self.reset()
-        return success
 
     @overload
     def activate(self, func: "_F" = ...) -> "_F":
         """Overload for scenario when 'responses.activate' is used."""
 
     @overload
-    def activate(  # type: ignore[misc]
+    def activate(
         self,
         *,
         registry: Type[Any] = ...,

responses/_recorder.py

@@ -23,6 +23,7 @@
 
 import yaml
 
+from responses import _UNSET
 from responses import RequestsMock
 from responses import Response
 from responses import _real_send
@@ -153,6 +154,7 @@ def _on_request(
             status=requests_response.status_code,
             body=requests_response.text,
             headers=headers_values,
+            content_type=requests_response.headers.get("Content-Type", _UNSET),
         )
         self._registry.add(responses_response)
         return requests_response

responses/tests/test_matchers.py

@@ -869,7 +869,7 @@ def run():
 
 class TestHeaderWithRegex:
     @property
-    def url(self):  # type: ignore[misc]
+    def url(self) -> str:
         return "http://example.com/"
 
     def _register(self):

responses/tests/test_recorder.py

@@ -58,7 +58,7 @@ def get_data(host, port):
                     "url": f"http://{host}:{port}/202",
                     "body": "OK",
                     "status": 202,
-                    "content_type": "text/plain",
+                    "content_type": "image/tiff",
                     "auto_calculate_content_length": False,
                 }
             },
@@ -132,7 +132,7 @@ def prepare_server(self, httpserver):
         httpserver.expect_request("/202").respond_with_data(
             "OK",
             status=202,
-            content_type="text/plain",
+            content_type="image/tiff",
         )
         httpserver.expect_request("/404").respond_with_data(
             "404 Not Found",

responses/tests/test_responses.py

@@ -927,12 +927,12 @@ def test_function(a, b=None):
 
 
 @pytest.fixture
-def my_fruit():  # type: ignore[misc]
+def my_fruit() -> str:
     return "apple"
 
 
 @pytest.fixture
-def fruit_basket(my_fruit):  # type: ignore[misc]
+def fruit_basket(my_fruit: str) -> "list[str]":
     return ["banana", my_fruit]
 
 
@@ -1334,7 +1334,7 @@ def test_handles_buffered_reader_body():
 
     @responses.activate
     def run():
-        responses.add(responses.GET, url, body=BufferedReader(BytesIO(b"test")))  # type: ignore
+        responses.add(responses.GET, url, body=BufferedReader(BytesIO(b"test")))
 
         resp = requests.get(url)
 
@@ -1559,7 +1559,7 @@ def run():
         responses.add(
             responses.GET,
             url,
-            body=BufferedReader(BytesIO(b"testing")),  # type: ignore
+            body=BufferedReader(BytesIO(b"testing")),
             auto_calculate_content_length=True,
         )
         resp = requests.get(url)