← eval3_submission_v2

requests_7505

resolved RESOLVED PASS · 16 tool calls · 106 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 (17)

#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": 640
}
{"status": "ok", "filepath": "src/requests/models.py", "content": " (body, content_type) = self._encode_files(files, raw_data)\n else:\n if raw_data:\n body = s
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "                (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": 640, "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}
6read_file
{
 "end_line": 35,
 "filepath": "src/requests/_types.py",
 "start_line": 20
}
{"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", "start_line": 20, "end_line": 35, "total_lines": 183, "is_truncated": false}
7edit_file
{
 "filepath": "src/requests/_types.py",
 "new_string": "@runtime_checkable\\nclass SupportsRead(Protocol[_T_co]):\\n    def read(self, length: int = ..., /) -> _T_co: ...\\n\\n    def __instancecheck__(self, instance): \\n        return isinstance(instance, SupportsRead) or hasattr(instance, \\\"read\\\")\\n",
 "old_string": "@runtime_checkable\\nclass SupportsRead(Protocol[_T_co]):\\n    def read(self, length: int = ..., /) -> _T_co: ..."
}
{"status": "error", "error_type": "FileEditError", "error_message": "old_string not found in file (tried exact, flexible and regex matching)"}
full
{"status": "error", "error_type": "FileEditError", "error_message": "old_string not found in file (tried exact, flexible and regex matching)"}
8read_file
{
 "end_line": 30,
 "filepath": "src/requests/_types.py",
 "start_line": 25
}
{"status": "ok", "filepath": "src/requests/_types.py", "content": "\n\n@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n def read(self, length: int = .
full
{"status": "ok", "filepath": "src/requests/_types.py", "content": "\n\n@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n    def read(self, length: int = ..., /) -> _T_co: ...\n\n", "start_line": 25, "end_line": 30, "total_lines": 183, "is_truncated": false}
9edit_file
{
 "filepath": "src/requests/_types.py",
 "new_string": "@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n    def read(self, length: int = ..., /) -> _T_co: ...\n\n    def __instancecheck__(self, instance):\n        return isinstance(instance, SupportsRead) or hasattr(instance, \"read\")\n",
 "old_string": "@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n    def read(self, length: int = ..., /) -> _T_co: ..."
}
{"status": "ok", "filepath": "src/requests/_types.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/_types.py\n+++ b/src/requests/_types.p
full
{"status": "ok", "filepath": "src/requests/_types.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/_types.py\n+++ b/src/requests/_types.py\n@@ -27,6 +27,10 @@\n @runtime_checkable\n class SupportsRead(Protocol[_T_co]):\n     def read(self, length: int = ..., /) -> _T_co: ...\n+\n+    def __instancecheck__(self, instance):\n+        return isinstance(instance, SupportsRead) or hasattr(instance, \"read\")\n+\n \n \n @runtime_checkable\n", "is_truncated": false}
10run_command
{
 "command": "python3 -c \"from typing import Protocol, runtime_checkable; @runtime_checkable\\nclass SupportsRead(Protocol):\\n    def read(self, length=None):\\n        ...\\nclass Proxy:\\n    def read(self, length=None):\\n        return 'data'\\nprint(isinstance(Proxy(), SupportsRead))\""
}
{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": " File \"<string>\", l
full
{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "  File \"<string>\", line 1\n    from typing import Protocol, runtime_checkable; @runtime_checkable\\nclass SupportsRead(Protocol):\\n    def read(self, length=None):\\n        ...\\nclass Proxy:\\n    def read(self, length=None):\\n        return 'data'\\nprint(isinstance(Proxy(), SupportsRead))\n                                                    ^\nSyntaxError: invalid syntax\n", "exit_code": 1}}
11run_command
{
 "command": "cat > /tmp/test_protocol.py <<'EOF'\nfrom typing import Protocol, runtime_checkable\n\n@runtime_checkable\nclass SupportsRead(Protocol):\n    def read(self, length=None):\n        ...\n\nclass Proxy:\n    def read(self, length=None):\n        return 'data'\n\nprint(f\"isinstance(Proxy(), SupportsRead): {isinstance(Proxy(), SupportsRead)}\")\nEOF\npython3 /tmp/test_protocol.py"
}
{"status": "ok", "stdout": "isinstance(Proxy(), SupportsRead): True\n", "exit_code": 0}
full
{"status": "ok", "stdout": "isinstance(Proxy(), SupportsRead): True\n", "exit_code": 0}
12run_command
{
 "command": "cat >/tmp/test_protocol.py <<'EOF'\nfrom typing import Protocol, runtime_checkable\n\n@runtime_checkable\nclass SupportsRead(Protocol):\n    def read(self, length=None):\n        ...\n    def __instancecheck__(self, instance):\n        return hasattr(instance, \"read\")\n\nclass Proxy:\n    def read(self, length=None):\n        return 'data'\n\nprint(f\"isinstance(Proxy(), SupportsRead): {isinstance(Proxy(), SupportsRead)}\")\nEOF\npython3 /tmp/test_protocol.py"
}
{"status": "ok", "stdout": "isinstance(Proxy(), SupportsRead): False\n", "exit_code": 0}
full
{"status": "ok", "stdout": "isinstance(Proxy(), SupportsRead): False\n", "exit_code": 0}
13run_command
{
 "command": "grep -rn \"isinstance(.*, _SupportsRead)\" src/requests | grep -v \"hasattr(.*, \\\"read\\\")\""
}
{"status": "ok", "stdout": "src/requests/models.py:164: elif isinstance(data, _SupportsRead):\nsrc/requests/models.py:644: if isinstance(data, basestring) or is
full
{"status": "ok", "stdout": "src/requests/models.py:164:        elif isinstance(data, _SupportsRead):\nsrc/requests/models.py:644:                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):\n", "exit_code": 0}
14edit_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}
15edit_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}
16edit_file
{
 "filepath": "src/requests/_types.py",
 "new_string": "@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n    def read(self, length: int = ..., /) -> _T_co: ...\n",
 "old_string": "@runtime_checkable\nclass SupportsRead(Protocol[_T_co]):\n    def read(self, length: int = ..., /) -> _T_co: ...\n\n    def __instancecheck__(self, instance):\n        return isinstance(instance, SupportsRead) or hasattr(instance, \"read\")\n"
}
{"status": "ok", "filepath": "src/requests/_types.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/_types.py\n+++ b/src/requests/_types.p
full
{"status": "ok", "filepath": "src/requests/_types.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/_types.py\n+++ b/src/requests/_types.py\n@@ -27,9 +27,6 @@\n @runtime_checkable\n class SupportsRead(Protocol[_T_co]):\n     def read(self, length: int = ..., /) -> _T_co: ...\n-\n-    def __instancecheck__(self, instance):\n-        return isinstance(instance, SupportsRead) or hasattr(instance, \"read\")\n \n \n \n", "is_truncated": false}
17submit_patch
[]
{"status": "ok", "patch_size": 1446, "files_changed": 2}
full
{"status": "ok", "patch_size": 1446, "files_changed": 2}

Patch

diff --git a/src/requests/_types.py b/src/requests/_types.py
index b2273d61..59c0e94c 100644
--- a/src/requests/_types.py
+++ b/src/requests/_types.py
@@ -29,6 +29,7 @@ class SupportsRead(Protocol[_T_co]):
     def read(self, length: int = ..., /) -> _T_co: ...
 
 
+
 @runtime_checkable
 class SupportsItems(Protocol[_KT_co, _VT_co]):
     def items(self) -> Iterable[tuple[_KT_co, _VT_co]]: ...
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/eval3_submission_v2/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/eval3_submission_v2/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/eval3_submission_v2/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/eval3_submission_v2/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.04s
[2026-09-24 10:51:56,322] 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 10:51:57] "GET /get HTTP/1.1" 200 285
127.0.0.1 - - [24/Sep/2026 10:52:27] "GET /redirect-to?url=http%3A%2F%2F%3A1 HTTP/1.1" 302 0