From f9fa5521938b125c761a08d30b7fc17e588876a1 Mon Sep 17 00:00:00 2001
From: Nate Prewitt <nate.prewitt@gmail.com>
Date: Sat, 18 May 2024 14:59:14 -0700
Subject: [PATCH] Linting cleanup

---
 requests/sessions.py   |  2 +-
 setup.cfg              |  2 +-
 tests/test_requests.py | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/requests/sessions.py b/requests/sessions.py
index dbcf2a7b0e..df35bfe2cd 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -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
diff --git a/setup.cfg b/setup.cfg
index bf21c81cc0..7001049b9c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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
diff --git a/tests/test_requests.py b/tests/test_requests.py
index b420c44d73..5a01f5fbb2 100644
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -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")