← eval4_submission_v1b

requests_7505

resolved RESOLVED PASS · 7 tool calls · 53 s · psf/requests

Task input

Add hasattr checks for remaining protocol isinstance checks

This PR is a successor to #7502. The proxied-read case appears in the standard library which points to it being a pretty well established pattern. A quick search shows there are two other places this was missed in.

Rather than put `or hasattr(data, "read")` everywhere we use want to use `SupportsRead`, this combines it into a single check that scopes typing correctly for proxy objects. That should hopefully avoid missing it for future checks as well.

Tool calls (8)

#ToolArgumentsResult
1run_command
{
 "command": "grep -rn \"SupportsRead\" src/requests | head -20"
}
{"status": "ok", "stdout": "src/requests/models.py:39:from ._types import SupportsRead as _SupportsRead\nsrc/requests/models.py:144: data: _t.SupportsRead[str |
full
{"status": "ok", "stdout": "src/requests/models.py:39:from ._types import SupportsRead as _SupportsRead\nsrc/requests/models.py:144:        data: _t.SupportsRead[str | bytes],\nsrc/requests/models.py:145:    ) -> _t.SupportsRead[str | bytes]: ...\nsrc/requests/models.py:154:    ) -> str | bytes | _t.SupportsRead[str | bytes]:\nsrc/requests/models.py:164:        elif isinstance(data, _SupportsRead):\nsrc/requests/models.py:241:            elif isinstance(fp, _SupportsRead) or hasattr(fp, \"read\"):\nsrc/requests/models.py:644:                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):\nsrc/requests/_types.py:28:class SupportsRead(Protocol[_T_co]):\nsrc/requests/_types.py:95:    StreamDataType: TypeAlias = SupportsRead[str | bytes]\nsrc/requests/_types.py:104:        | SupportsRead[str | bytes]\nsrc/requests/_types.py:109:        bytes | str | Iterable[bytes | str] | SupportsRead[bytes | str] | None\nsrc/requests/_types.py:118:    _FileContent: TypeAlias = SupportsRead[str | bytes] | str | bytes\n", "exit_code": 0}
2read_file
{
 "filepath": "src/requests/_types.py",
 "start_line": 20,
 "end_line": 40
}
{"status": "ok", "filepath": "src/requests/_types.py", "content": ")\n\n_T_co = TypeVar(\"_T_co\", covariant=True)\n_KT_co = TypeVar(\"_KT_co\", covariant=True)
full
{"status": "ok", "filepath": "src/requests/_types.py", "content": ")\n\n_T_co = TypeVar(\"_T_co\", covariant=True)\n_KT_co = TypeVar(\"_KT_co\", covariant=True)\n_VT_co = TypeVar(\"_VT_co\", covariant=True)\n\n\n@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n    def read(self, length: int = ..., /) -> _T_co: ...\n\n\n@runtime_checkable\nclass SupportsItems(Protocol[_KT_co, _VT_co]):\n    def items(self) -> Iterable[tuple[_KT_co, _VT_co]]: ...\n\n\n# These are needed at runtime for default_hooks() return type\nHookType: TypeAlias = Callable[[\"Response\"], Any]\nHooksInputType: TypeAlias = Mapping[str, Iterable[HookType] | HookType]\n\n", "start_line": 20, "end_line": 40, "total_lines": 183, "is_truncated": false}
3read_file
{
 "end_line": 170,
 "filepath": "src/requests/models.py",
 "start_line": 150
}
{"status": "ok", "filepath": "src/requests/models.py", "content": "\n @staticmethod\n def _encode_params(\n data: _t.EncodableDataType,\n ) -> str | bytes | _t.
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "\n    @staticmethod\n    def _encode_params(\n        data: _t.EncodableDataType,\n    ) -> str | bytes | _t.SupportsRead[str | bytes]:\n        \"\"\"Encode parameters in a piece of data.\n\n        Will successfully encode parameters when passed as a dict or a list of\n        2-tuples. Order is retained if data is a list of 2-tuples but arbitrary\n        if parameters are supplied as a dict.\n        \"\"\"\n\n        if isinstance(data, (str, bytes)):\n            return data\n        elif isinstance(data, _SupportsRead):\n            return data\n        elif hasattr(data, \"__iter__\"):\n            result: list[tuple[bytes, bytes]] = []\n            for k, vs in to_key_val_list(data):\n                if isinstance(vs, basestring) or not hasattr(vs, \"__iter__\"):\n                    vs = [vs]\n", "start_line": 150, "end_line": 170, "total_lines": 1187, "is_truncated": false}
4read_file
{
 "end_line": 650,
 "filepath": "src/requests/models.py",
 "start_line": 630
}
{"status": "ok", "filepath": "src/requests/models.py", "content": " if length:\n self.headers[\"Content-Length\"] = builtin_str(length)\n else:\n self.headers[\
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "            if length:\n                self.headers[\"Content-Length\"] = builtin_str(length)\n            else:\n                self.headers[\"Transfer-Encoding\"] = \"chunked\"\n        else:\n            # After is_stream filtering, remaining data is raw (not streamed)\n            raw_data = cast(\"_t.RawDataType | None\", data)\n\n            # Multi-part file uploads.\n            if files:\n                (body, content_type) = self._encode_files(files, raw_data)\n            else:\n                if raw_data:\n                    body = self._encode_params(raw_data)\n                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):\n                        content_type = None\n                    else:\n                        content_type = \"application/x-www-form-urlencoded\"\n\n            self.prepare_content_length(body)\n\n", "start_line": 630, "end_line": 650, "total_lines": 1187, "is_truncated": false}
5read_file
{
 "end_line": 250,
 "filepath": "src/requests/models.py",
 "start_line": 230
}
{"status": "ok", "filepath": "src/requests/models.py", "content": " fn, fp, ft = v\n else:\n fn, fp, ft, fh = v\n else:\n fn = guess_filename(v) or k\n fp = v\n
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "                    fn, fp, ft = v\n                else:\n                    fn, fp, ft, fh = v\n            else:\n                fn = guess_filename(v) or k\n                fp = v\n\n            if isinstance(fp, (str, bytes, bytearray)):\n                fdata = fp\n            # data that proxies attributes to underlying objects needs hasattr\n            # defensive check for untyped callers\n            elif isinstance(fp, _SupportsRead) or hasattr(fp, \"read\"):\n                fdata = fp.read()\n            elif fp is None:  # defensive check for untyped callers\n                continue\n            else:\n                fdata = fp\n\n            rf = RequestField(name=k, data=fdata, filename=fn, headers=fh)\n            rf.make_multipart(content_type=ft)\n            new_fields.append(rf)\n", "start_line": 230, "end_line": 250, "total_lines": 1187, "is_truncated": false}
6edit_file
{
 "filepath": "src/requests/models.py",
 "new_string": "        elif isinstance(data, _SupportsRead) or hasattr(data, \"read\"):",
 "old_string": "        elif isinstance(data, _SupportsRead):"
}
{"status": "ok", "filepath": "src/requests/models.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/models.py\n+++ b/src/requests/models.p
full
{"status": "ok", "filepath": "src/requests/models.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/models.py\n+++ b/src/requests/models.py\n@@ -161,7 +161,7 @@\n \n         if isinstance(data, (str, bytes)):\n             return data\n-        elif isinstance(data, _SupportsRead):\n+        elif isinstance(data, _SupportsRead) or hasattr(data, \"read\"):\n             return data\n         elif hasattr(data, \"__iter__\"):\n             result: list[tuple[bytes, bytes]] = []\n", "is_truncated": false}
7edit_file
{
 "filepath": "src/requests/models.py",
 "new_string": "                    if isinstance(data, basestring) or isinstance(data, _SupportsRead) or hasattr(data, \"read\"):",
 "old_string": "                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):"
}
{"status": "ok", "filepath": "src/requests/models.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/models.py\n+++ b/src/requests/models.p
full
{"status": "ok", "filepath": "src/requests/models.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/models.py\n+++ b/src/requests/models.py\n@@ -641,7 +641,7 @@\n             else:\n                 if raw_data:\n                     body = self._encode_params(raw_data)\n-                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):\n+                    if isinstance(data, basestring) or isinstance(data, _SupportsRead) or hasattr(data, \"read\"):\n                         content_type = None\n                     else:\n                         content_type = \"application/x-www-form-urlencoded\"\n", "is_truncated": false}
8submit_patch
[]
{"status": "ok", "patch_size": 1049, "files_changed": 1}
full
{"status": "ok", "patch_size": 1049, "files_changed": 1}

Patch

diff --git a/src/requests/models.py b/src/requests/models.py
index ebeba1e3..e798d91d 100644
--- a/src/requests/models.py
+++ b/src/requests/models.py
@@ -161,7 +161,7 @@ class RequestEncodingMixin:
 
         if isinstance(data, (str, bytes)):
             return data
-        elif isinstance(data, _SupportsRead):
+        elif isinstance(data, _SupportsRead) or hasattr(data, "read"):
             return data
         elif hasattr(data, "__iter__"):
             result: list[tuple[bytes, bytes]] = []
@@ -641,7 +641,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             else:
                 if raw_data:
                     body = self._encode_params(raw_data)
-                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):
+                    if isinstance(data, basestring) or isinstance(data, _SupportsRead) or hasattr(data, "read"):
                         content_type = None
                     else:
                         content_type = "application/x-www-form-urlencoded"

Test output

show
........................................................................ [ 21%]
.................................................spytest-httpbin server hit an exception serving request: [SSL: TLSV1_ALERT_UNKNOWN_CA] tlsv1 alert unknown ca (_ssl.c:1032)
attempting to ignore so the rest of the tests can run
...................... [ 42%]
........................................................................ [ 63%]
..........................x............................................. [ 84%]
.....................................................                    [100%]
=============================== warnings summary ===============================
../../../../../../kaggle/tmp/envs/requests/lib/python3.13/site-packages/_pytest/config/__init__.py:1464
  /kaggle/tmp/envs/requests/lib/python3.13/site-packages/_pytest/config/__init__.py:1464: PytestConfigWarning: Unknown config option: timeout
  
    self._warn_or_fail_if_strict(f"Unknown config option: {key}\n")

tests/test_requests.py::TestRequests::test_set_basicauth[42-42]
tests/test_requests.py::TestRequests::test_set_basicauth[42-42]
  /tmp/swe_work/eval4_submission_v1b/requests_7505/b/workspace/src/requests/auth.py:45: DeprecationWarning: Non-string usernames will no longer be supported in Requests 3.0.0. Please convert the object you've passed in (42) to a string or bytes object in the near future to avoid problems.
    warnings.warn(

tests/test_requests.py::TestRequests::test_set_basicauth[42-42]
tests/test_requests.py::TestRequests::test_set_basicauth[42-42]
  /tmp/swe_work/eval4_submission_v1b/requests_7505/b/workspace/src/requests/auth.py:55: DeprecationWarning: Non-string passwords will no longer be supported in Requests 3.0.0. Please convert the object you've passed in (<class 'int'>) to a string or bytes object in the near future to avoid problems.
    warnings.warn(

tests/test_requests.py::TestRequests::test_set_basicauth[None-None]
tests/test_requests.py::TestRequests::test_set_basicauth[None-None]
  /tmp/swe_work/eval4_submission_v1b/requests_7505/b/workspace/src/requests/auth.py:45: DeprecationWarning: Non-string usernames will no longer be supported in Requests 3.0.0. Please convert the object you've passed in (None) to a string or bytes object in the near future to avoid problems.
    warnings.warn(

tests/test_requests.py::TestRequests::test_set_basicauth[None-None]
tests/test_requests.py::TestRequests::test_set_basicauth[None-None]
  /tmp/swe_work/eval4_submission_v1b/requests_7505/b/workspace/src/requests/auth.py:55: DeprecationWarning: Non-string passwords will no longer be supported in Requests 3.0.0. Please convert the object you've passed in (<class 'NoneType'>) to a string or bytes object in the near future to avoid problems.
    warnings.warn(

tests/test_requests.py::TestPreparingURLs::test_different_connection_pool_for_tls_settings_verify_True
tests/test_requests.py::TestPreparingURLs::test_different_connection_pool_for_tls_settings_verify_bundle_expired_cert
tests/test_requests.py::TestPreparingURLs::test_different_connection_pool_for_tls_settings_verify_bundle_unexpired_cert
tests/test_requests.py::TestPreparingURLs::test_different_connection_pool_for_mtls_settings
  /kaggle/tmp/envs/requests/lib/python3.13/site-packages/urllib3/connectionpool.py:1129: InsecureRequestWarning: Unverified HTTPS request is being made to host 'localhost'. Adding certificate verification is strongly advised. See: https://urllib3.readthedocs.io/en/latest/advanced-usage.html#tls-warnings
    warnings.warn(

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
339 passed, 1 skipped, 1 xfailed, 13 warnings in 39.02s
[2026-09-24 15:41:03,691] WARNING in core: flasgger is not installed; serving the static landing page at / and skipping the Swagger UI and /spec.json.
127.0.0.1 - - [24/Sep/2026 15:41:04] "GET /get HTTP/1.1" 200 300
127.0.0.1 - - [24/Sep/2026 15:41:34] "GET /redirect-to?url=http%3A%2F%2F%3A1 HTTP/1.1" 302 0