resolved RESOLVED PASS · 18 tool calls · 131 s · psf/requests
Fix empty netrc entry usage
Prior to Python 3.11, a netrc entry without a username, account, or password entry was treated as malformed and raised a `NetrcParseError` disabling usage. For 3.11+, it now returns an empty tuple `('', '' ,'')` instead. That results in Requests sending an empty entry (`:`) for the value to encode in an Authorization header.
This PR brings Requests back to its intended behavior of ignoring these profiles. Anyone who may have some use case for this, we did not to intend to support this behavior. If you need it going forward, you can pass `auth=('', '')` with your request.| # | Tool | Arguments | Result |
|---|---|---|---|
| 1 | run_command | {
"command": "grep -rn \"netrc\" ."
} | {"status": "ok", "stdout": "./src/requests/sessions.py:47: get_netrc_auth,\n./src/requests/sessions.py:298: # .netrc might have more auth for us on our new hostfull{"status": "ok", "stdout": "./src/requests/sessions.py:47: get_netrc_auth,\n./src/requests/sessions.py:298: # .netrc might have more auth for us on our new host.\n./src/requests/sessions.py:299: new_auth = get_netrc_auth(url) if self.trust_env else None\n./src/requests/sessions.py:482: auth = get_netrc_auth(request.url)\n./src/requests/utils.py:60:NETRC_FILES = (\".netrc\", \"_netrc\")\n./src/requests/utils.py:205:def get_netrc_auth(url, raise_errors=False):\n./src/requests/utils.py:206: \"\"\"Returns the Requests tuple auth for a given url from netrc.\"\"\"\n./src/requests/utils.py:208: netrc_file = os.environ.get(\"NETRC\")\n./src/requests/utils.py:209: if netrc_file is not None:\n./src/requests/utils.py:210: netrc_locations = (netrc_file,)\n./src/requests/utils.py:212: netrc_locations = (f\"~/{f}\" for f in NETRC_FILES)\n./src/requests/utils.py:215: from netrc import NetrcParseError, netrc\n./src/requests/utils.py:217: netrc_path = None\n./src/requests/utils.py:219: for f in netrc_locations:\n./src/requests/utils.py:222: netrc_path = loc\n./src/requests/utils.py:226: if netrc_path is None:\n./src/requests/utils.py:233: _netrc = netrc(netrc_path).authenticators(host)\n./src/requests/utils.py:234: if _netrc:\n./src/requests/utils.py:236: login_i = 0 if _netrc[0] else 1\n./src/requests/utils.py:237: return (_netrc[login_i], _netrc[2])\n./src/requests/utils.py:240: # we'll just skip netrc auth unless explicitly asked to raise errors.\n./HISTORY.md:29: netrc file.\n./HISTORY.md:965:- `requests.utils.get_netrc_auth` now takes an `raise_errors` kwarg,\n./HISTORY.md:966: defaulting to `False`. When `True`, errors parsing `.netrc` files\n./HISTORY.md:1268: from \\~/.netrc when running as a user without a home directory.\n./HISTORY.md:1364:- `.netrc` no longer overrides explicit auth.\n./HISTORY.md:1642:- |
| 2 | read_file | {
"end_line": 245,
"filepath": "src/requests/utils.py",
"start_line": 205
} | {"status": "ok", "filepath": "src/requests/utils.py", "content": "def get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a givfull{"status": "ok", "filepath": "src/requests/utils.py", "content": "def get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a given url from netrc.\"\"\"\n\n netrc_file = os.environ.get(\"NETRC\")\n if netrc_file is not None:\n netrc_locations = (netrc_file,)\n else:\n netrc_locations = (f\"~/{f}\" for f in NETRC_FILES)\n\n try:\n from netrc import NetrcParseError, netrc\n\n netrc_path = None\n\n for f in netrc_locations:\n loc = os.path.expanduser(f)\n if os.path.exists(loc):\n netrc_path = loc\n break\n\n # Abort early if there isn't one.\n if netrc_path is None:\n return\n\n ri = urlparse(url)\n host = ri.hostname\n\n try:\n _netrc = netrc(netrc_path).authenticators(host)\n if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n return (_netrc[login_i], _netrc[2])\n except (NetrcParseError, OSError):\n # If there was a parsing error or a permissions issue reading the file,\n # we'll just skip netrc auth unless explicitly asked to raise errors.\n if raise_errors:\n raise\n\n # App Engine hackiness.\n except (ImportError, AttributeError):\n", "start_line": 205, "end_line": 245, "total_lines": 1084, "is_truncated": false} |
| 3 | read_file | {
"end_line": 485,
"filepath": "src/requests/sessions.py",
"start_line": 470
} | {"status": "ok", "filepath": "src/requests/sessions.py", "content": " # Bootstrap CookieJar.\n if not isinstance(cookies, cookielib.CookieJar):\n cookies = cookfull{"status": "ok", "filepath": "src/requests/sessions.py", "content": " # Bootstrap CookieJar.\n if not isinstance(cookies, cookielib.CookieJar):\n cookies = cookiejar_from_dict(cookies)\n\n # Merge with session cookies\n merged_cookies = merge_cookies(\n merge_cookies(RequestsCookieJar(), self.cookies), cookies\n )\n\n # Set environment's basic authentication if not explicitly set.\n auth = request.auth\n if self.trust_env and not auth and not self.auth:\n auth = get_netrc_auth(request.url)\n\n p = PreparedRequest()\n p.prepare(\n", "start_line": 470, "end_line": 485, "total_lines": 832, "is_truncated": false} |
| 4 | read_file | {
"filepath": "src/requests/utils.py",
"start_line": 205,
"end_line": 250
} | {"status": "ok", "filepath": "src/requests/utils.py", "content": "def get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a givfull{"status": "ok", "filepath": "src/requests/utils.py", "content": "def get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a given url from netrc.\"\"\"\n\n netrc_file = os.environ.get(\"NETRC\")\n if netrc_file is not None:\n netrc_locations = (netrc_file,)\n else:\n netrc_locations = (f\"~/{f}\" for f in NETRC_FILES)\n\n try:\n from netrc import NetrcParseError, netrc\n\n netrc_path = None\n\n for f in netrc_locations:\n loc = os.path.expanduser(f)\n if os.path.exists(loc):\n netrc_path = loc\n break\n\n # Abort early if there isn't one.\n if netrc_path is None:\n return\n\n ri = urlparse(url)\n host = ri.hostname\n\n try:\n _netrc = netrc(netrc_path).authenticators(host)\n if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n return (_netrc[login_i], _netrc[2])\n except (NetrcParseError, OSError):\n # If there was a parsing error or a permissions issue reading the file,\n # we'll just skip netrc auth unless explicitly asked to raise errors.\n if raise_errors:\n raise\n\n # App Engine hackiness.\n except (ImportError, AttributeError):\n pass\n\n\ndef guess_filename(obj):\n \"\"\"Tries to guess the filename of the given object.\"\"\"\n", "start_line": 205, "end_line": 250, "total_lines": 1084, "is_truncated": false} |
| 5 | write_file | {
"content": "import os\nfrom urllib.parse import urlparse\nfrom netrc import netrc\n\n# Mocking NETRC_FILES for the test\nNETRC_FILES = ['.netrc', '_netrc']\n\ndef get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a given url from netrc.\"\"\"\n\n netrc_file = os.environ.get(\"NETRC\")\n if netrc_file is not None:\n netrc_locations = (netrc_file,)\n else:\n netrc_locations = (f\"~/{f}\" for f in NETRC_FILES)\n\n try:\n from netrc import NetrcParseError, netrc as netrc_func\n\n netrc_path = None\n\n for f in netrc_locations:\n loc = os.path.expanduser(f)\n if os.path.exists(loc):\n netrc_path = loc\n break\n\n # Abort early if there isn't one.\n if netrc_path is None:\n return\n\n ri = urlparse(url)\n host = ri.hostname\n\n try:\n _netrc = netrc_func(netrc_path).authenticators(host)\n if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n return (_netrc[login_i], _netrc[2])\n except (NetrcParseError, OSError):\n # If there was a parsing error or a permissions issue reading the file,\n # we'll just skip netrc auth unless explicitly asked to raise errors.\n if raise_errors:\n raise\n\n # App Engine hackiness.\n except (ImportError, AttributeError):\n pass\n\n# Test case for empty netrc entry\ndef test_empty_netrc():\n # Create a temporary netrc file with an empty entry for example.com\n # Format: machine host login password secret\n # An empty entry might look like: machine example.com\n netrc_content = \"machine example.com\\n\"\n with open(\".netrc_test\", \"w\") as f:\n f.write(netrc_content)\n \n os.environ[\"NETRC\"] = \".netrc_test\"\n \n # In Python 3.11+, netrc().authenticators('example.com') returns ('', '', '')\n # We want get_netrc_auth to return None (or not return a tuple) if it's effectively empty.\n auth = get_netrc_auth(\"http://example.com\")\n print(f\"Auth result: {auth}\")\n \n # The goal is to ignore these profiles.\n # If auth is ('', ''), it will be used. If it is None, it will be ignored.\n assert auth is None or (auth[0] and auth[1]), f\"Expected auth to be None or have values, got {auth}\"\n\n # Cleanup\n os.remove(\".netrc_test\")\n del os.environ[\"NETRC\"]\n\nif __name__ == \"__main__\":\n try:\n test_empty_netrc()\n print(\"Test passed!\")\n except Exception as e:\n print(f\"Test failed: {e}\")\n",
"filepath": "/tmp/test_netrc.py"
} | {"status": "ok", "filepath": "/tmp/test_netrc.py", "size": 2566}full{"status": "ok", "filepath": "/tmp/test_netrc.py", "size": 2566} |
| 6 | run_command | {
"command": "python3 /tmp/test_netrc.py"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open ffull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open file '/tmp/swe_work/eval_submission_analyzer/requests_7205/a/tmp/test_netrc.py': [Errno 2] No such file or directory\n", "exit_code": 2}} |
| 7 | run_command | {
"command": "python3 /workspace/tmp/test_netrc.py"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open ffull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open file '/tmp/swe_work/eval_submission_analyzer/requests_7205/a/workspace/tmp/test_netrc.py': [Errno 2] No such file or directory\n", "exit_code": 2}} |
| 8 | run_command | {
"command": "ls -R /tmp"
} | {"status": "ok", "stdout": "/tmp/swe_work/eval_submission_analyzer/requests_7205/a/tmp:\n", "exit_code": 0}full{"status": "ok", "stdout": "/tmp/swe_work/eval_submission_analyzer/requests_7205/a/tmp:\n", "exit_code": 0} |
| 9 | run_command | {
"command": "python3 /tmp/test_netrc.py"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open ffull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open file '/tmp/swe_work/eval_submission_analyzer/requests_7205/a/tmp/test_netrc.py': [Errno 2] No such file or directory\n", "exit_code": 2}} |
| 10 | write_file | {
"content": "import os\nfrom urllib.parse import urlparse\nfrom netrc import netrc\n\n# Mocking NETRC_FILES for the test\nNETRC_FILES = ['.netrc', '_netrc']\n\ndef get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a given url from netrc.\"\"\"\n\n netrc_file = os.environ.get(\"NETRC\")\n if netrc_file is not None:\n netrc_locations = (netrc_file,)\n else:\n netrc_locations = (f\"~/{f}\" for f in NETRC_FILES)\n\n try:\n from netrc import NetrcParseError, netrc as netrc_func\n\n netrc_path = None\n\n for f in netrc_locations:\n loc = os.path.expanduser(f)\n if os.path.exists(loc):\n netrc_path = loc\n break\n\n # Abort early if there isn't one.\n if netrc_path is None:\n return\n\n ri = urlparse(url)\n host = ri.hostname\n\n try:\n _netrc = netrc_func(netrc_path).authenticators(host)\n if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n return (_netrc[login_i], _netrc[2])\n except (NetrcParseError, OSError):\n # If there was a parsing error or a permissions issue reading the file,\n # we'll just skip netrc auth unless explicitly asked to raise errors.\n if raise_errors:\n raise\n\n # App Engine hackiness.\n except (ImportError, AttributeError):\n pass\n\n# Test case for empty netrc entry\ndef test_empty_netrc():\n # Create a temporary netrc file with an empty entry for example.com\n # Format: machine host login password secret\n # An empty entry might look like: machine example.com\n netrc_content = \"machine example.com\\n\"\n with open(\"netrc_test\", \"w\") as f:\n f.write(netrc_content)\n \n os.environ[\"NETRC\"] = \"netrc_test\"\n \n # In Python 3.11+, netrc().authenticators('example.com') returns ('', '', '')\n # We want get_netrc_auth to return None (or not return a tuple) if it's effectively empty.\n auth = get_netrc_auth(\"http://example.com\")\n print(f\"Auth result: {auth}\")\n \n # The goal is to ignore these profiles.\n # If auth is ('', ''), it will be used. If it is None, it will be ignored.\n assert auth is None or (auth[0] and auth[1]), f\"Expected auth to be None or have values, got {auth}\"\n\n # Cleanup\n os.remove(\"netrc_test\")\n del os.environ[\"NETRC\"]\n\nif __name__ == \"__main__\":\n try:\n test_empty_netrc()\n print(\"Test passed!\")\n except Exception as e:\n print(f\"Test failed: {e}\")\n import traceback\n traceback.print_exc()\n exit(1)\n",
"filepath": "/workspace/test_netrc.py"
} | {"status": "ok", "filepath": "/workspace/test_netrc.py", "size": 2634}full{"status": "ok", "filepath": "/workspace/test_netrc.py", "size": 2634} |
| 11 | run_command | {
"command": "python3 /workspace/test_netrc.py"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open ffull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open file '/tmp/swe_work/eval_submission_analyzer/requests_7205/a/workspace/test_netrc.py': [Errno 2] No such file or directory\n", "exit_code": 2}} |
| 12 | run_command | {
"command": "ls -la /workspace"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "ls: cannot access '/tfull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "ls: cannot access '/tmp/swe_work/eval_submission_analyzer/requests_7205/a/workspace': No such file or directory\n", "exit_code": 2}} |
| 13 | run_command | {
"command": "ls -la ."
} | {"status": "ok", "stdout": "total 176\ndrwx------ 9 786478 89939 4096 Sep 24 06:50 .\ndrwxr-xr-x 4 root root 4096 Sep 24 06:48 ..\n-rw-r--r-- 1 786478 89939 33 full{"status": "ok", "stdout": "total 176\ndrwx------ 9 786478 89939 4096 Sep 24 06:50 .\ndrwxr-xr-x 4 root root 4096 Sep 24 06:48 ..\n-rw-r--r-- 1 786478 89939 33 Jul 15 15:36 .coveragerc\ndrwxr-xr-x 7 786478 89939 4096 Sep 24 06:48 .git\n-rw-r--r-- 1 786478 89939 234 Jul 15 15:36 .git-blame-ignore-revs\ndrwxr-xr-x 4 786478 89939 4096 Jul 15 15:36 .github\n-rw-r--r-- 1 786478 89939 321 Jul 15 15:36 .gitignore\n-rw-r--r-- 1 786478 89939 352 Jul 15 15:36 .pre-commit-config.yaml\n-rw-r--r-- 1 786478 89939 738 Jul 15 15:36 .readthedocs.yaml\n-rw-r--r-- 1 786478 89939 8025 Jul 15 15:36 AUTHORS.rst\n-rw-r--r-- 1 786478 89939 61266 Jul 15 15:36 HISTORY.md\n-rw-r--r-- 1 786478 89939 10142 Jul 15 15:36 LICENSE\n-rw-r--r-- 1 786478 89939 126 Jul 15 15:36 MANIFEST.in\n-rw-r--r-- 1 786478 89939 834 Jul 15 15:36 Makefile\n-rw-r--r-- 1 786478 89939 38 Jul 15 15:36 NOTICE\n-rw-r--r-- 1 786478 89939 2940 Jul 15 15:36 README.md\ndrwxr-xr-x 8 786478 89939 4096 Jul 15 15:36 docs\ndrwxr-xr-x 2 786478 89939 4096 Jul 15 15:36 ext\n-rw-r--r-- 1 786478 89939 2868 Jul 15 15:36 pyproject.toml\n-rw-r--r-- 1 root root 109 Sep 24 06:48 pytest.ini\n-rw-r--r-- 1 786478 89939 92 Jul 15 15:36 requirements-dev.txt\n-rwxr-xr-x 1 786478 89939 179 Jul 15 15:36 setup.py\ndrwxr-xr-x 3 786478 89939 4096 Jul 15 15:36 src\n-rw-r--r-- 1 root root 2634 Sep 24 06:50 test_netrc.py\ndrwxr-xr-x 4 786478 89939 4096 Jul 15 15:36 tests\ndrwxr-xr-x 2 root root 4096 Sep 24 06:49 tmp\n-rw-r--r-- 1 786478 89939 285 Jul 15 15:36 tox.ini\n", "exit_code": 0} |
| 14 | run_command | {
"command": "python3 test_netrc.py"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "Auth result: ('', '')\nTest failed:full{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "Auth result: ('', '')\nTest failed: Expected auth to be None or have values, got ('', '')\n", "stderr": "Traceback (most recent call last):\n File \"/workspace/test_netrc.py\", line 77, in <module>\n test_empty_netrc()\n ~~~~~~~~~~~~~~~~^^\n File \"/workspace/test_netrc.py\", line 69, in test_empty_netrc\n assert auth is None or (auth[0] and auth[1]), f\"Expected auth to be None or have values, got {auth}\"\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nAssertionError: Expected auth to be None or have values, got ('', '')\n", "exit_code": 1}} |
| 15 | edit_file | {
"filepath": "src/requests/utils.py",
"new_string": " if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n auth = (_netrc[login_i], _netrc[2])\n if auth[0] or auth[1]:\n return auth",
"old_string": " if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n return (_netrc[login_i], _netrc[2])"
} | {"status": "ok", "filepath": "src/requests/utils.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/utils.py\n+++ b/src/requests/utils.py\nfull{"status": "ok", "filepath": "src/requests/utils.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/src/requests/utils.py\n+++ b/src/requests/utils.py\n@@ -234,7 +234,9 @@\n if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n- return (_netrc[login_i], _netrc[2])\n+ auth = (_netrc[login_i], _netrc[2])\n+ if auth[0] or auth[1]:\n+ return auth\n except (NetrcParseError, OSError):\n # If there was a parsing error or a permissions issue reading the file,\n # we'll just skip netrc auth unless explicitly asked to raise errors.\n", "is_truncated": false} |
| 16 | write_file | {
"content": "import os\nfrom urllib.parse import urlparse\nfrom netrc import netrc\n\n# Mocking NETRC_FILES for the test\nNETRC_FILES = ['.netrc', '_netrc']\n\ndef get_netrc_auth(url, raise_errors=False):\n \"\"\"Returns the Requests tuple auth for a given url from netrc.\"\"\"\n\n netrc_file = os.environ.get(\"NETRC\")\n if netrc_file is not None:\n netrc_locations = (netrc_file,)\n else:\n netrc_locations = (f\"~/{f}\" for f in NETRC_FILES)\n\n try:\n from netrc import NetrcParseError, netrc as netrc_func\n\n netrc_path = None\n\n for f in netrc_locations:\n loc = os.path.expanduser(f)\n if os.path.exists(loc):\n netrc_path = loc\n break\n\n # Abort early if there isn't one.\n if netrc_path is None:\n return\n\n ri = urlparse(url)\n host = ri.hostname\n\n try:\n _netrc = netrc_func(netrc_path).authenticators(host)\n if _netrc:\n # Return with login / password\n login_i = 0 if _netrc[0] else 1\n auth = (_netrc[login_i], _netrc[2])\n if auth[0] or auth[1]:\n return auth\n except (NetrcParseError, OSError):\n # If there was a parsing error or a permissions issue reading the file,\n # we'll just skip netrc auth unless explicitly asked to raise errors.\n if raise_errors:\n raise\n\n # App Engine hackiness.\n except (ImportError, AttributeError):\n pass\n\n# Test case for empty netrc entry\ndef test_empty_netrc():\n # Create a temporary netrc file with an empty entry for example.com\n # Format: machine host login password secret\n # An empty entry might look like: machine example.com\n netrc_content = \"machine example.com\\n\"\n with open(\"netrc_test\", \"w\") as f:\n f.write(netrc_content)\n \n os.environ[\"NETRC\"] = \"netrc_test\"\n \n # In Python 3.11+, netrc().authenticators('example.com') returns ('', '', '')\n # We want get_netrc_auth to return None (or not return a tuple) if it's effectively empty.\n auth = get_netrc_auth(\"http://example.com\")\n print(f\"Auth result: {auth}\")\n \n # The goal is to ignore these profiles.\n # If auth is ('', ''), it will be used. If it is None, it will be ignored.\n assert auth is None, f\"Expected auth to be None, got {auth}\"\n\n # Cleanup\n os.remove(\"netrc_test\")\n del os.environ[\"NETRC\"]\n\nif __name__ == \"__main__\":\n try:\n test_empty_netrc()\n print(\"Test passed!\")\n except Exception as e:\n print(f\"Test failed: {e}\")\n import traceback\n traceback.print_exc()\n exit(1)\n",
"filepath": "/workspace/test_netrc.py"
} | {"status": "ok", "filepath": "/workspace/test_netrc.py", "size": 2665}full{"status": "ok", "filepath": "/workspace/test_netrc.py", "size": 2665} |
| 17 | run_command | {
"command": "python3 /workspace/test_netrc.py"
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open ffull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 2", "details": {"stdout": "", "stderr": "python3: can't open file '/tmp/swe_work/eval_submission_analyzer/requests_7205/a/workspace/test_netrc.py': [Errno 2] No such file or directory\n", "exit_code": 2}} |
| 18 | run_command | {
"command": "python3 test_netrc.py"
} | {"status": "ok", "stdout": "Auth result: None\nTest passed!\n", "exit_code": 0}full{"status": "ok", "stdout": "Auth result: None\nTest passed!\n", "exit_code": 0} |
| 19 | submit_patch | [] | {"status": "ok", "patch_size": 6412, "files_changed": 3}full{"status": "ok", "patch_size": 6412, "files_changed": 3} |
diff --git a/src/requests/utils.py b/src/requests/utils.py
index 4d3039b2..d7d4e161 100644
--- a/src/requests/utils.py
+++ b/src/requests/utils.py
@@ -234,7 +234,9 @@ def get_netrc_auth(url, raise_errors=False):
if _netrc:
# Return with login / password
login_i = 0 if _netrc[0] else 1
- return (_netrc[login_i], _netrc[2])
+ auth = (_netrc[login_i], _netrc[2])
+ if auth[0] or auth[1]:
+ return auth
except (NetrcParseError, OSError):
# If there was a parsing error or a permissions issue reading the file,
# we'll just skip netrc auth unless explicitly asked to raise errors.
diff --git a/test_netrc.py b/test_netrc.py
new file mode 100644
index 00000000..4f6d8eb7
--- /dev/null
+++ b/test_netrc.py
@@ -0,0 +1,85 @@
+import os
+from urllib.parse import urlparse
+from netrc import netrc
+
+# Mocking NETRC_FILES for the test
+NETRC_FILES = ['.netrc', '_netrc']
+
+def get_netrc_auth(url, raise_errors=False):
+ """Returns the Requests tuple auth for a given url from netrc."""
+
+ netrc_file = os.environ.get("NETRC")
+ if netrc_file is not None:
+ netrc_locations = (netrc_file,)
+ else:
+ netrc_locations = (f"~/{f}" for f in NETRC_FILES)
+
+ try:
+ from netrc import NetrcParseError, netrc as netrc_func
+
+ netrc_path = None
+
+ for f in netrc_locations:
+ loc = os.path.expanduser(f)
+ if os.path.exists(loc):
+ netrc_path = loc
+ break
+
+ # Abort early if there isn't one.
+ if netrc_path is None:
+ return
+
+ ri = urlparse(url)
+ host = ri.hostname
+
+ try:
+ _netrc = netrc_func(netrc_path).authenticators(host)
+ if _netrc:
+ # Return with login / password
+ login_i = 0 if _netrc[0] else 1
+ auth = (_netrc[login_i], _netrc[2])
+ if auth[0] or auth[1]:
+ return auth
+ except (NetrcParseError, OSError):
+ # If there was a parsing error or a permissions issue reading the file,
+ # we'll just skip netrc auth unless explicitly asked to raise errors.
+ if raise_errors:
+ raise
+
+ # App Engine hackiness.
+ except (ImportError, AttributeError):
+ pass
+
+# Test case for empty netrc entry
+def test_empty_netrc():
+ # Create a temporary netrc file with an empty entry for example.com
+ # Format: machine host login password secret
+ # An empty entry might look like: machine example.com
+ netrc_content = "machine example.com\n"
+ with open("netrc_test", "w") as f:
+ f.write(netrc_content)
+
+ os.environ["NETRC"] = "netrc_test"
+
+ # In Python 3.11+, netrc().authenticators('example.com') returns ('', '', '')
+ # We want get_netrc_auth to return None (or not return a tuple) if it's effectively empty.
+ auth = get_netrc_auth("http://example.com")
+ print(f"Auth result: {auth}")
+
+ # The goal is to ignore these profiles.
+ # If auth is ('', ''), it will be used. If it is None, it will be ignored.
+ assert auth is None, f"Expected auth to be None, got {auth}"
+
+ # Cleanup
+ os.remove("netrc_test")
+ del os.environ["NETRC"]
+
+if __name__ == "__main__":
+ try:
+ test_empty_netrc()
+ print("Test passed!")
+ except Exception as e:
+ print(f"Test failed: {e}")
+ import traceback
+ traceback.print_exc()
+ exit(1)
diff --git a/tmp/test_netrc.py b/tmp/test_netrc.py
new file mode 100644
index 00000000..1f5e2f14
--- /dev/null
+++ b/tmp/test_netrc.py
@@ -0,0 +1,80 @@
+import os
+from urllib.parse import urlparse
+from netrc import netrc
+
+# Mocking NETRC_FILES for the test
+NETRC_FILES = ['.netrc', '_netrc']
+
+def get_netrc_auth(url, raise_errors=False):
+ """Returns the Requests tuple auth for a given url from netrc."""
+
+ netrc_file = os.environ.get("NETRC")
+ if netrc_file is not None:
+ netrc_locations = (netrc_file,)
+ else:
+ netrc_locations = (f"~/{f}" for f in NETRC_FILES)
+
+ try:
+ from netrc import NetrcParseError, netrc as netrc_func
+
+ netrc_path = None
+
+ for f in netrc_locations:
+ loc = os.path.expanduser(f)
+ if os.path.exists(loc):
+ netrc_path = loc
+ break
+
+ # Abort early if there isn't one.
+ if netrc_path is None:
+ return
+
+ ri = urlparse(url)
+ host = ri.hostname
+
+ try:
+ _netrc = netrc_func(netrc_path).authenticators(host)
+ if _netrc:
+ # Return with login / password
+ login_i = 0 if _netrc[0] else 1
+ return (_netrc[login_i], _netrc[2])
+ except (NetrcParseError, OSError):
+ # If there was a parsing error or a permissions issue reading the file,
+ # we'll just skip netrc auth unless explicitly asked to raise errors.
+ if raise_errors:
+ raise
+
+ # App Engine hackiness.
+ except (ImportError, AttributeError):
+ pass
+
+# Test case for empty netrc entry
+def test_empty_netrc():
+ # Create a temporary netrc file with an empty entry for example.com
+ # Format: machine host login password secret
+ # An empty entry might look like: machine example.com
+ netrc_content = "machine example.com\n"
+ with open(".netrc_test", "w") as f:
+ f.write(netrc_content)
+
+ os.environ["NETRC"] = ".netrc_test"
+
+ # In Python 3.11+, netrc().authenticators('example.com') returns ('', '', '')
+ # We want get_netrc_auth to return None (or not return a tuple) if it's effectively empty.
+ auth = get_netrc_auth("http://example.com")
+ print(f"Auth result: {auth}")
+
+ # The goal is to ignore these profiles.
+ # If auth is ('', ''), it will be used. If it is None, it will be ignored.
+ assert auth is None or (auth[0] and auth[1]), f"Expected auth to be None or have values, got {auth}"
+
+ # Cleanup
+ os.remove(".netrc_test")
+ del os.environ["NETRC"]
+
+if __name__ == "__main__":
+ try:
+ test_empty_netrc()
+ print("Test passed!")
+ except Exception as e:
+ print(f"Test failed: {e}")
..s..................................................................... [ 32%]
........................................................................ [ 65%]
..........................................................sssssssssss... [ 98%]
..s [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_utils.py::TestContentEncodingDetection::test_none
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta charset="UTF-8">]
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta http-equiv="Content-type" content="text/html;charset=UTF-8">]
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />]
tests/test_utils.py::TestContentEncodingDetection::test_pragmas[<?xml version="1.0" encoding="UTF-8"?>]
tests/test_utils.py::TestContentEncodingDetection::test_precedence
/tmp/swe_work/eval_submission_analyzer/requests_7205/b/workspace/src/requests/utils.py:484: DeprecationWarning: In requests 3.0, get_encodings_from_content will be removed. For more information, please see the discussion on issue #2266. (This warning should only appear once.)
warnings.warn(
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
206 passed, 13 skipped, 7 warnings in 0.21s
[2026-09-24 06:51:16,515] WARNING in core: flasgger is not installed; serving the static landing page at / and skipping the Swagger UI and /spec.json.