← eval_submission

requests_7433

resolved RESOLVED PASS · 5 tool calls · 27 s · psf/requests

Task input

Fix `prepare_body` stream detection for `__getattr__`-based file wrappers

Resolves #7432 .

Add `hasattr(data, "__iter__")` as a fallback stream detector:
```python
if (
    isinstance(data, Iterable) or hasattr(data, "__iter__")
) and not isinstance(data, (str, bytes, list, tuple, Mapping)):
```
This catches file-like objects that proxy their interface through `__getattr__`, restoring the 2.33.1 behavior without reverting the isinstance(Iterable) modernization for standard iterables.

Tool calls (6)

#ToolArgumentsResult
1run_command
{
 "command": "grep -rn \"prepare_body\" src/requests | head -20"
}
{"status": "ok", "stdout": "src/requests/models.py:442: self.prepare_body(data, files, json)\nsrc/requests/models.py:574: def prepare_body(\n", "exit_code": 0}
full
{"status": "ok", "stdout": "src/requests/models.py:442:        self.prepare_body(data, files, json)\nsrc/requests/models.py:574:    def prepare_body(\n", "exit_code": 0}
2read_file
{
 "filepath": "src/requests/models.py",
 "start_line": 574,
 "end_line": 650
}
{"status": "ok", "filepath": "src/requests/models.py", "content": " def prepare_body(\n self, data: _t.DataType, files: _t.FilesType, json: _t.JsonType = None\n
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "    def prepare_body(\n        self, data: _t.DataType, files: _t.FilesType, json: _t.JsonType = None\n    ) -> None:\n        \"\"\"Prepares the given HTTP body data.\"\"\"\n\n        # Check if file, fo, generator, iterator.\n        # If not, run through normal process.\n\n        # Nottin' on you.\n        body = None\n        content_type = None\n\n        if not data and json is not None:\n            # urllib3 requires a bytes-like body. Python 2's json.dumps\n            # provides this natively, but Python 3 gives a Unicode string.\n            content_type = \"application/json\"\n\n            try:\n                body = complexjson.dumps(json, allow_nan=False)\n            except ValueError as ve:\n                raise InvalidJSONError(ve, request=self)\n\n            if not isinstance(body, bytes):\n                body = body.encode(\"utf-8\")\n\n        if isinstance(data, Iterable) and not isinstance(\n            data, (str, bytes, list, tuple, Mapping)\n        ):\n            try:\n                length = super_len(data)\n            except (TypeError, AttributeError, UnsupportedOperation):\n                length = None\n\n            body = data\n\n            if getattr(body, \"tell\", None) is not None:\n                # Record the current file position before reading.\n                # This will allow us to rewind a file in the event\n                # of a redirect.\n                try:\n                    self._body_position = body.tell()  # type: ignore[union-attr]  # guarded by getattr check\n                except OSError:\n                    # This differentiates from None, allowing us to catch\n                    # a failed `tell()` later when trying to rewind the body\n                    self._body_position = object()\n\n            if files:\n                raise NotImplementedError(\n                    \"Streamed bodies and files are mutually exclusive.\"\
3read_file
{
 "end_line": 573,
 "filepath": "src/requests/models.py",
 "start_line": 500
}
{"status": "ok", "filepath": "src/requests/models.py", "content": " # Don't do any URL preparation for non-HTTP schemes like `mailto`,\n # `data` etc to work ar
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "        # Don't do any URL preparation for non-HTTP schemes like `mailto`,\n        # `data` etc to work around exceptions from `url_parse`, which\n        # handles RFC 3986 only.\n        if \":\" in url and not url.lower().startswith(\"http\"):\n            self.url = url\n            return\n\n        # Support for unicode domain names and paths.\n        try:\n            scheme, auth, host, port, path, query, fragment = parse_url(url)\n        except LocationParseError as e:\n            raise InvalidURL(*e.args)\n\n        if not scheme:\n            raise MissingSchema(\n                f\"Invalid URL {url!r}: No scheme supplied. \"\n                f\"Perhaps you meant https://{url}?\"\n            )\n\n        if not host:\n            raise InvalidURL(f\"Invalid URL {url!r}: No host supplied\")\n\n        # In general, we want to try IDNA encoding the hostname if the string contains\n        # non-ASCII characters. This allows users to automatically get the correct IDNA\n        # behaviour. For strings containing only ASCII characters, we need to also verify\n        # it doesn't start with a wildcard (*), before allowing the unencoded hostname.\n        if not unicode_is_ascii(host):\n            try:\n                host = self._get_idna_encoded_host(host)\n            except UnicodeError:\n                raise InvalidURL(\"URL has an invalid label.\")\n        elif host.startswith((\"*\", \".\")):\n            raise InvalidURL(\"URL has an invalid label.\")\n\n        # Carefully reconstruct the network location\n        netloc = auth or \"\"\n        if netloc:\n            netloc += \"@\"\n        netloc += host\n        if port:\n            netloc += f\":{port}\"\n\n        # Bare domains aren't valid URLs.\n        if not path:\n            path = \"/\"\n\n        if isinstance(params, (str, bytes)):\n            params = to_native_string(params)\n\n        if params is not None
4read_file
{
 "end_line": 100,
 "filepath": "src/requests/models.py",
 "start_line": 1
}
{"status": "ok", "filepath": "src/requests/models.py", "content": "\"\"\"\nrequests.models\n~~~~~~~~~~~~~~~\n\nThis module contains the primary objects that pow
full
{"status": "ok", "filepath": "src/requests/models.py", "content": "\"\"\"\nrequests.models\n~~~~~~~~~~~~~~~\n\nThis module contains the primary objects that power Requests.\n\"\"\"\n\nfrom __future__ import annotations\n\nimport datetime\n\n# Import encoding now, to avoid implicit import later.\n# Implicit import within threads may cause LookupError when standard library is in a ZIP,\n# such as in Embedded Python. See https://github.com/psf/requests/issues/3578.\nimport encodings.idna  # noqa: F401  # type: ignore[reportUnusedImport]\nfrom collections.abc import Callable, Generator, Iterable, Iterator, Mapping\nfrom io import UnsupportedOperation\nfrom typing import (\n    TYPE_CHECKING,\n    Any,\n    Final,\n    Literal,\n    cast,\n    overload,\n)\n\nfrom urllib3.exceptions import (\n    DecodeError,\n    LocationParseError,\n    ProtocolError,\n    ReadTimeoutError,\n    SSLError,\n)\nfrom urllib3.fields import RequestField\nfrom urllib3.filepost import encode_multipart_formdata\nfrom urllib3.util import parse_url\n\nfrom ._internal_utils import to_native_string, unicode_is_ascii\nfrom ._types import SupportsRead as _SupportsRead\nfrom .auth import HTTPBasicAuth\nfrom .compat import (\n    JSONDecodeError,\n    basestring,\n    builtin_str,\n    chardet,\n    cookielib,\n    urlencode,\n    urlsplit,\n    urlunparse,\n)\nfrom .compat import json as complexjson\nfrom .cookies import (\n    _copy_cookie_jar,  # type: ignore[reportPrivateUsage]\n    cookiejar_from_dict,\n    get_cookie_header,\n)\nfrom .exceptions import (\n    ChunkedEncodingError,\n    ConnectionError,\n    ContentDecodingError,\n    HTTPError,\n    InvalidJSONError,\n    InvalidURL,\n    MissingSchema,\n    StreamConsumedError,\n)\nfrom .exceptions import JSONDecodeError as RequestsJSONDecodeError\nfrom .exceptions import SSLError as RequestsSSLError\nfrom .hooks import default_hooks\nfrom .status_codes import codes\nfrom .structures import CaseInsensitiveDict\nfrom .utils import (\n    check_h
5edit_file
{
 "filepath": "src/requests/models.py",
 "new_string": "        if (isinstance(data, Iterable) or hasattr(data, \"__iter__\")) and not isinstance(\n            data, (str, bytes, list, tuple, Mapping)\n        ):",
 "old_string": "        if isinstance(data, Iterable) and not isinstance(\n            data, (str, bytes, list, tuple, Mapping)\n        ):"
}
{"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@@ -596,7 +596,7 @@\n             if not isinstance(body, bytes):\n                 body = body.encode(\"utf-8\")\n \n-        if isinstance(data, Iterable) and not isinstance(\n+        if (isinstance(data, Iterable) or hasattr(data, \"__iter__\")) and not isinstance(\n             data, (str, bytes, list, tuple, Mapping)\n         ):\n             try:\n", "is_truncated": false}
6submit_patch
[]
{"status": "ok", "patch_size": 560, "files_changed": 1}
full
{"status": "ok", "patch_size": 560, "files_changed": 1}

Patch

diff --git a/src/requests/models.py b/src/requests/models.py
index 4142f2a4..f2b6b318 100644
--- a/src/requests/models.py
+++ b/src/requests/models.py
@@ -596,7 +596,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             if not isinstance(body, bytes):
                 body = body.encode("utf-8")
 
-        if isinstance(data, Iterable) and not isinstance(
+        if (isinstance(data, Iterable) or hasattr(data, "__iter__")) and not isinstance(
             data, (str, bytes, list, tuple, Mapping)
         ):
             try:

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/eval_submission/requests_7433/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/eval_submission/requests_7433/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/eval_submission/requests_7433/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/eval_submission/requests_7433/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
337 passed, 1 skipped, 1 xfailed, 13 warnings in 38.96s
[2026-09-24 06:21:48,704] 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 06:21:49] "PUT /put HTTP/1.1" 200 412
127.0.0.1 - - [24/Sep/2026 06:22:19] "GET /redirect-to?url=http%3A%2F%2F%3A1 HTTP/1.1" 302 0