Skip to content

Commit

Permalink
Linting cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nateprewitt committed May 18, 2024
1 parent d7797d2 commit f9fa552
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion requests/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def rebuild_proxies(self, prepared_request, proxies):

# urllib3 handles proxy authorization for us in the standard adapter.
# Avoid appending this to TLS tunneled requests where it may be leaked.
if not scheme.startswith('https') and username and password:
if not scheme.startswith("https") and username and password:
headers["Proxy-Authorization"] = _basic_auth_str(username, password)

return new_proxies
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ requires-dist =
urllib3>=1.21.1,<1.27

[flake8]
ignore = E203, E501, W503
ignore = E203, E231, E501, W503
per-file-ignores =
requests/__init__.py:E402, F401
requests/compat.py:E402, F401
Expand Down
17 changes: 9 additions & 8 deletions tests/test_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -647,25 +647,26 @@ def test_proxy_authorization_preserved_on_request(self, httpbin):

assert sent_headers.get("Proxy-Authorization") == proxy_auth_value


@pytest.mark.parametrize(
"url,has_proxy_auth",
(
('http://example.com', True),
('https://example.com', False),
("http://example.com", True),
("https://example.com", False),
),
)
def test_proxy_authorization_not_appended_to_https_request(self, url, has_proxy_auth):
def test_proxy_authorization_not_appended_to_https_request(
self, url, has_proxy_auth
):
session = requests.Session()
proxies = {
'http': 'http://test:pass@localhost:8080',
'https': 'http://test:pass@localhost:8090',
"http": "http://test:pass@localhost:8080",
"https": "http://test:pass@localhost:8090",
}
req = requests.Request('GET', url)
req = requests.Request("GET", url)
prep = req.prepare()
session.rebuild_proxies(prep, proxies)

assert ('Proxy-Authorization' in prep.headers) is has_proxy_auth
assert ("Proxy-Authorization" in prep.headers) is has_proxy_auth

def test_basicauth_with_netrc(self, httpbin):
auth = ("user", "pass")
Expand Down

0 comments on commit f9fa552

Please sign in to comment.