← pod_r3_v1g

requests_7505

resolved RESOLVED PASS · 14 tool calls · 48 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 (15)

#ToolArgumentsResult
1run_command
{
 "command": "grep -rn \"SupportsRead\" src/requests | head -20"
}
{"status": "ok", "stdout": "src/requests/_types.py:28:class SupportsRead(Protocol[_T_co]):\nsrc/requests/_types.py:95: StreamDataType: TypeAlias = SupportsRead[
full
{"status": "ok", "stdout": "src/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\nsrc/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):\n", "stderr": "", "exit_code": 0}
2run_command
{
 "command": "sed -n '160,170p' src/requests/models.py"
}
{"status": "ok", "stdout": " \"\"\"\n\n if isinstance(data, (str, bytes)):\n return data\n elif isinstance(data, _SupportsRead):\n return data\n elif hasattr(da
full
{"status": "ok", "stdout": "        \"\"\"\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", "stderr": "", "exit_code": 0}
3run_command
{
 "command": "sed -n '640,650p' src/requests/models.py"
}
{"status": "ok", "stdout": " (body, content_type) = self._encode_files(files, raw_data)\n else:\n if raw_data:\n body = self._encode_params(raw_data)\n if isins
full
{"status": "ok", "stdout": "                (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", "stderr": "", "exit_code": 0}
4run_command
{
 "command": "grep -n \"isinstance(.*, _SupportsRead)\" src/requests/models.py"
}
{"status": "ok", "stdout": "164: elif isinstance(data, _SupportsRead):\n241: elif isinstance(fp, _SupportsRead) or hasattr(fp, \"read\"):\n644: if isinstance(da
full
{"status": "ok", "stdout": "164:        elif isinstance(data, _SupportsRead):\n241:            elif isinstance(fp, _SupportsRead) or hasattr(fp, \"read\"):\n644:                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):\n", "stderr": "", "exit_code": 0}
5run_command
{
 "command": "sed -n '230,250p' src/requests/models.py"
}
{"status": "ok", "stdout": " 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, bytea
full
{"status": "ok", "stdout": "                    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", "stderr": "", "exit_code": 0}
6run_command
{
 "command": "cd /workspace && python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"src/requests/models.py\")\ns = p.read_text()\n\n# Fix 1: line 164\nold1 = \"\"\"        elif isinstance(data, _SupportsRead):\"\"\"\nnew1 = \"\"\"        elif isinstance(data, _SupportsRead) or hasattr(data, \"read\"):\"\"\"\n\n# Fix 2: line 644\n# Note: basestring is likely a typo in the grep output or an old version, \n# let's check the actual content of line 644 again.\nPY\n"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
7run_command
{
 "command": "sed -n '640,650p' src/requests/models.py"
}
{"status": "ok", "stdout": " (body, content_type) = self._encode_files(files, raw_data)\n else:\n if raw_data:\n body = self._encode_params(raw_data)\n if isins
full
{"status": "ok", "stdout": "                (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", "stderr": "", "exit_code": 0}
8run_command
{
 "command": "grep -n \"basestring\" src/requests/models.py"
}
{"status": "ok", "stdout": "43: basestring,\n169: if isinstance(vs, basestring) or not hasattr(vs, \"__iter__\"):\n197: elif isinstance(data, basestring):\n205:
full
{"status": "ok", "stdout": "43:    basestring,\n169:                if isinstance(vs, basestring) or not hasattr(vs, \"__iter__\"):\n197:        elif isinstance(data, basestring):\n205:            if isinstance(val, basestring) or not hasattr(val, \"__iter__\"):\n644:                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):\n", "stderr": "", "exit_code": 0}
9run_command
{
 "command": "cd /workspace && python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"src/requests/models.py\")\ns = p.read_text()\n\n# Fix 1: line 164\nold1 = '        elif isinstance(data, _SupportsRead):'\nnew1 = '        elif isinstance(data, _SupportsRead) or hasattr(data, \"read\"):'\n\n# Fix 2: line 644\nold2 = '                    if isinstance(data, basestring) or isinstance(data, _SupportsRead):'\nnew2 = '                    if isinstance(data, basestring) or isinstance(data, _SupportsRead) or hasattr(data, \"read\"):'\n\ns = s.replace(old1, new1).replace(old2, new2)\np.write_text(s)\nPY\n"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
10run_command
{
 "command": "sed -n '160,170p' src/requests/models.py"
}
{"status": "ok", "stdout": " \"\"\"\n\n if isinstance(data, (str, bytes)):\n return data\n elif isinstance(data, _SupportsRead) or hasattr(data, \"read\"):\n re
full
{"status": "ok", "stdout": "        \"\"\"\n\n        if isinstance(data, (str, bytes)):\n            return data\n        elif isinstance(data, _SupportsRead) or hasattr(data, \"read\"):\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", "stderr": "", "exit_code": 0}
11run_command
{
 "command": "sed -n '640,650p' src/requests/models.py"
}
{"status": "ok", "stdout": " (body, content_type) = self._encode_files(files, raw_data)\n else:\n if raw_data:\n body = self._encode_params(raw_data)\n if isins
full
{"status": "ok", "stdout": "                (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) or hasattr(data, \"read\"):\n                        content_type = None\n                    else:\n                        content_type = \"application/x-www-form-urlencoded\"\n\n            self.prepare_content_length(body)\n\n", "stderr": "", "exit_code": 0}
12run_command
{
 "command": "python3 -m py_compile src/requests/models.py"
}
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
full
{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}
13run_command
{
 "command": "git diff src/requests/models.py"
}
{"status": "ok", "stdout": "diff --git a/src/requests/models.py b/src/requests/models.py\nindex ebeba1e3..e798d91d 100644\n--- a/src/requests/models.py\n+++ b/s
full
{"status": "ok", "stdout": "diff --git a/src/requests/models.py b/src/requests/models.py\nindex ebeba1e3..e798d91d 100644\n--- a/src/requests/models.py\n+++ b/src/requests/models.py\n@@ -161,7 +161,7 @@ class RequestEncodingMixin:\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@@ -641,7 +641,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):\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", "stderr": "", "exit_code": 0}
14run_command
{
 "command": "submit_patch"
}
{"status": "error", "error_type": "CommandError", "error_message": "/bin/bash: submit_patch: command not found\n", "details": {"stdout": "", "stderr": "/bin/bas
full
{"status": "error", "error_type": "CommandError", "error_message": "/bin/bash: submit_patch: command not found\n", "details": {"stdout": "", "stderr": "/bin/bash: submit_patch: command not found\n", "exit_code": 127}}
15submit_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 ===============================
../../../../../../../Users/jp/repos/kaggle-gemini-coding-agent-post-training/.envs/requests/lib/python3.13/site-packages/_pytest/config/__init__.py:1464
  /Users/jp/repos/kaggle-gemini-coding-agent-post-training/.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/pod_r3_v1g/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/pod_r3_v1g/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/pod_r3_v1g/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/pod_r3_v1g/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
  /Users/jp/repos/kaggle-gemini-coding-agent-post-training/.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 38.76s
[2026-09-25 17:55:23,210] WARNING in core: flasgger is not installed; serving the static landing page at / and skipping the Swagger UI and /spec.json.