Reformat and Linting

Author: dakshbhayana11811137

tests/common/constants.py

@@ -7,33 +7,33 @@
 REMOTE_ADDR_SALTED = "a69a49383d81404e4b1df297c7baa28e1cd6c4ee1495ed5d0ab165a63a147763"
 
 DUMMY_GITHUB_OIDC_JWT = (
-        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ZTY3YjFjYi0yYjhkLTRiZ"
-        "TUtOTFjYi03NTdlZGIyZWM5NzAiLCJzdWIiOiJyZXBvOmZvby9iYXIiLCJhdWQiOiJweXB"
-        "pIiwicmVmIjoiZmFrZSIsInNoYSI6ImZha2UiLCJyZXBvc2l0b3J5IjoiZm9vL2JhciIsI"
-        "nJlcG9zaXRvcnlfb3duZXIiOiJmb28iLCJyZXBvc2l0b3J5X293bmVyX2lkIjoiMTIzIiw"
-        "icnVuX2lkIjoiZmFrZSIsInJ1bl9udW1iZXIiOiJmYWtlIiwicnVuX2F0dGVtcHQiOiIxI"
-        "iwicmVwb3NpdG9yeV9pZCI6ImZha2UiLCJhY3Rvcl9pZCI6ImZha2UiLCJhY3RvciI6ImZ"
-        "vbyIsIndvcmtmbG93IjoiZmFrZSIsImhlYWRfcmVmIjoiZmFrZSIsImJhc2VfcmVmIjoiZ"
-        "mFrZSIsImV2ZW50X25hbWUiOiJmYWtlIiwicmVmX3R5cGUiOiJmYWtlIiwiZW52aXJvbm1"
-        "lbnQiOiJmYWtlIiwiam9iX3dvcmtmbG93X3JlZiI6ImZvby9iYXIvLmdpdGh1Yi93b3JrZ"
-        "mxvd3MvZXhhbXBsZS55bWxAZmFrZSIsImlzcyI6Imh0dHBzOi8vdG9rZW4uYWN0aW9ucy5"
-        "naXRodWJ1c2VyY29udGVudC5jb20iLCJuYmYiOjE2NTA2NjMyNjUsImV4cCI6MTY1MDY2N"
-        "DE2NSwiaWF0IjoxNjUwNjYzODY1fQ.f-FMv5FF5sdxAWeUilYDt9NoE7Et0vbdNhK32c2o"
-        "C-E"
-    )
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ZTY3YjFjYi0yYjhkLTRiZ"
+    "TUtOTFjYi03NTdlZGIyZWM5NzAiLCJzdWIiOiJyZXBvOmZvby9iYXIiLCJhdWQiOiJweXB"
+    "pIiwicmVmIjoiZmFrZSIsInNoYSI6ImZha2UiLCJyZXBvc2l0b3J5IjoiZm9vL2JhciIsI"
+    "nJlcG9zaXRvcnlfb3duZXIiOiJmb28iLCJyZXBvc2l0b3J5X293bmVyX2lkIjoiMTIzIiw"
+    "icnVuX2lkIjoiZmFrZSIsInJ1bl9udW1iZXIiOiJmYWtlIiwicnVuX2F0dGVtcHQiOiIxI"
+    "iwicmVwb3NpdG9yeV9pZCI6ImZha2UiLCJhY3Rvcl9pZCI6ImZha2UiLCJhY3RvciI6ImZ"
+    "vbyIsIndvcmtmbG93IjoiZmFrZSIsImhlYWRfcmVmIjoiZmFrZSIsImJhc2VfcmVmIjoiZ"
+    "mFrZSIsImV2ZW50X25hbWUiOiJmYWtlIiwicmVmX3R5cGUiOiJmYWtlIiwiZW52aXJvbm1"
+    "lbnQiOiJmYWtlIiwiam9iX3dvcmtmbG93X3JlZiI6ImZvby9iYXIvLmdpdGh1Yi93b3JrZ"
+    "mxvd3MvZXhhbXBsZS55bWxAZmFrZSIsImlzcyI6Imh0dHBzOi8vdG9rZW4uYWN0aW9ucy5"
+    "naXRodWJ1c2VyY29udGVudC5jb20iLCJuYmYiOjE2NTA2NjMyNjUsImV4cCI6MTY1MDY2N"
+    "DE2NSwiaWF0IjoxNjUwNjYzODY1fQ.f-FMv5FF5sdxAWeUilYDt9NoE7Et0vbdNhK32c2o"
+    "C-E"
+)
 
 DUMMY_ACTIVESTATE_OIDC_JWT = (
-        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ZTY3YjFjYi0yYjhkLTRi"
-        "ZTUtOTFjYi03NTdlZGIyZWM5NzAiLCJzdWIiOiJvcmc6ZmFrZW9yZzpwcm9qZWN0OmZha"
-        "2Vwcm9qZWN0IiwiYXVkIjoicHlwaSIsImFjdG9yX2lkIjoiZmFrZSIsImFjdG9yIjoiZm"
-        "9vIiwib3JhZ2FuaXphdGlvbl9pZCI6IjdlNjdiMWNiLTJiOGQtNGJlNS05MWNiLTc1N2V"
-        "kYjJlYzk3MCIsIm9yZ2FuaXphdGlvbiI6ImZha2VvcmciLCJwcm9qZWN0X3Zpc2liaWxp"
-        "dHkiOiJwcml2YXRlIiwicHJvamVjdF9pZCI6IjhlNjdiMWNiLTJiOGQtNGJlNS05MWNiL"
-        "Tc1N2VkYjJlYzk3MCIsInByb2plY3RfcGF0aCI6ImZha2VvcmcvZmFrZXByb2plY3QiLC"
-        "Jwcm9qZWN0IjoiZmFrZXByb2plY3QiLCJidWlsZGVyIjoicHlwaV9idWlsZGVyIiwiaW5"
-        "ncmVkaWVudF9uYW1lIjoiZmFrZWluZ3JlZGllbnQiLCJhcnRpZmFjdF9pZCI6IjllNjdi"
-        "MWNiLTJiOGQtNGJlNS05MWNiLTc1N2VkYjJlYzk3MCIsImlzcyI6Imh0dHBzOi8vcGxhd"
-        "GZvcm0uYWN0aXZlc3RhdGUuY29tL2FwaS92MS9vYXV0aC9vaWRjIiwibmJmIjoxNjUwNj"
-        "YzMjY1LCJleHAiOjE2NTA2NjQxNjUsImlhdCI6MTY1MDY2Mzg2NX0.R4q-vWAFXHrBSBK"
-        "AZuHHIsGOkqlirPxEtLfjLIDiLr0"
-    )
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ZTY3YjFjYi0yYjhkLTRi"
+    "ZTUtOTFjYi03NTdlZGIyZWM5NzAiLCJzdWIiOiJvcmc6ZmFrZW9yZzpwcm9qZWN0OmZha"
+    "2Vwcm9qZWN0IiwiYXVkIjoicHlwaSIsImFjdG9yX2lkIjoiZmFrZSIsImFjdG9yIjoiZm"
+    "9vIiwib3JhZ2FuaXphdGlvbl9pZCI6IjdlNjdiMWNiLTJiOGQtNGJlNS05MWNiLTc1N2V"
+    "kYjJlYzk3MCIsIm9yZ2FuaXphdGlvbiI6ImZha2VvcmciLCJwcm9qZWN0X3Zpc2liaWxp"
+    "dHkiOiJwcml2YXRlIiwicHJvamVjdF9pZCI6IjhlNjdiMWNiLTJiOGQtNGJlNS05MWNiL"
+    "Tc1N2VkYjJlYzk3MCIsInByb2plY3RfcGF0aCI6ImZha2VvcmcvZmFrZXByb2plY3QiLC"
+    "Jwcm9qZWN0IjoiZmFrZXByb2plY3QiLCJidWlsZGVyIjoicHlwaV9idWlsZGVyIiwiaW5"
+    "ncmVkaWVudF9uYW1lIjoiZmFrZWluZ3JlZGllbnQiLCJhcnRpZmFjdF9pZCI6IjllNjdi"
+    "MWNiLTJiOGQtNGJlNS05MWNiLTc1N2VkYjJlYzk3MCIsImlzcyI6Imh0dHBzOi8vcGxhd"
+    "GZvcm0uYWN0aXZlc3RhdGUuY29tL2FwaS92MS9vYXV0aC9vaWRjIiwibmJmIjoxNjUwNj"
+    "YzMjY1LCJleHAiOjE2NTA2NjQxNjUsImlhdCI6MTY1MDY2Mzg2NX0.R4q-vWAFXHrBSBK"
+    "AZuHHIsGOkqlirPxEtLfjLIDiLr0"
+)

tests/conftest.py

@@ -65,11 +65,10 @@
 from warehouse.subscriptions import services as subscription_services
 from warehouse.subscriptions.interfaces import IBillingService, ISubscriptionService
 
+from .common.constants import REMOTE_ADDR, REMOTE_ADDR_HASHED
 from .common.db import Session
 from .common.db.accounts import EmailFactory, UserFactory
 from .common.db.ip_addresses import IpAddressFactory
-from .common.constants import REMOTE_ADDR, REMOTE_ADDR_HASHED
-
 
 _HERE = Path(__file__).parent.resolve()
 _FIXTURES = _HERE / "_fixtures"

tests/unit/accounts/test_forms.py

@@ -33,6 +33,7 @@
 from warehouse.captcha import recaptcha
 from warehouse.events.tags import EventTag
 from warehouse.utils.webauthn import AuthenticationRejectedError
+
 from ...common.constants import REMOTE_ADDR
 
 

tests/unit/accounts/test_security_policy.py

@@ -21,6 +21,7 @@
 from warehouse.accounts import UserContext, security_policy
 from warehouse.accounts.interfaces import IUserService
 from warehouse.utils.security_policy import AuthenticationMethod
+
 from ...common.constants import REMOTE_ADDR
 
 

tests/unit/accounts/test_services.py

@@ -47,9 +47,9 @@
 from warehouse.metrics import IMetricsService, NullMetrics
 from warehouse.rate_limiting.interfaces import IRateLimiter
 
+from ...common.constants import REMOTE_ADDR
 from ...common.db.accounts import EmailFactory, UserFactory
 from ...common.db.ip_addresses import IpAddressFactory
-from ...common.constants import REMOTE_ADDR
 
 
 class TestDatabaseUserService:

tests/unit/email/test_init.py

@@ -24,9 +24,10 @@
 from warehouse.email.interfaces import IEmailSender
 from warehouse.email.services import EmailMessage
 
+from ...common.constants import REMOTE_ADDR
 from ...common.db.accounts import EmailFactory, UserFactory
 from ...common.db.organizations import TeamFactory
-from ...common.constants import REMOTE_ADDR
+
 
 @pytest.mark.parametrize(
     ("user", "address", "expected"),

tests/unit/forklift/test_legacy.py

@@ -66,7 +66,6 @@
     ReleaseFactory,
     RoleFactory,
 )
-from ...common.constants import REMOTE_ADDR
 
 
 def _get_tar_testdata(compression_type=""):

tests/unit/manage/test_forms.py

@@ -22,8 +22,8 @@
 from warehouse.accounts.models import ProhibitedEmailDomain
 from warehouse.manage import forms
 
-from ...common.db.packaging import ProjectFactory
 from ...common.constants import REMOTE_ADDR
+from ...common.db.packaging import ProjectFactory
 
 
 class TestCreateRoleForm:

tests/unit/oidc/test_views.py

@@ -40,7 +40,8 @@
 from warehouse.packaging import services
 from warehouse.packaging.models import Project
 from warehouse.rate_limiting.interfaces import IRateLimiter
-from ...common.constants import DUMMY_GITHUB_OIDC_JWT, DUMMY_ACTIVESTATE_OIDC_JWT
+
+from ...common.constants import DUMMY_ACTIVESTATE_OIDC_JWT, DUMMY_GITHUB_OIDC_JWT
 
 
 def test_ratelimiters():
@@ -192,9 +193,7 @@ def find_service(self, *a, **kw):
         assert err["description"] == "malformed JWT"
 
 
-def test_mint_token_from_oidc_jwt_decode_leaky_exception(
-    monkeypatch
-):
+def test_mint_token_from_oidc_jwt_decode_leaky_exception(monkeypatch):
     class Request:
         def __init__(self):
             self.response = pretend.stub(status=None)
@@ -308,8 +307,7 @@ def test_mint_token_from_oidc_creates_expected_service(
     assert mint_token.calls == [pretend.call(oidc_service, token, request)]
 
 
-def test_mint_token_from_trusted_publisher_verify_jwt_signature_fails(
-):
+def test_mint_token_from_trusted_publisher_verify_jwt_signature_fails():
     oidc_service = pretend.stub(
         verify_jwt_signature=pretend.call_recorder(lambda token: None),
     )
@@ -405,9 +403,7 @@ def find_publishers_mockup(_, pending: bool = False):
     }
 
 
-def test_mint_token_pending_publisher_project_already_exists(
-    db_request
-):
+def test_mint_token_pending_publisher_project_already_exists(db_request):
     project = ProjectFactory.create()
     pending_publisher = PendingGitHubPublisherFactory.create(
         project_name=project.name,
@@ -442,10 +438,7 @@ def test_mint_token_pending_publisher_project_already_exists(
     assert oidc_service.find_publisher.calls == [pretend.call(claims, pending=True)]
 
 
-def test_mint_token_from_oidc_pending_publisher_ok(
-    monkeypatch,
-    db_request
-):
+def test_mint_token_from_oidc_pending_publisher_ok(monkeypatch, db_request):
     user = UserFactory.create()
 
     pending_publisher = PendingGitHubPublisherFactory.create(
@@ -681,9 +674,7 @@ def find_service(iface, **kw):
     ]
 
 
-def test_mint_token_warn_constrain_environment(
-    monkeypatch, db_request
-):
+def test_mint_token_warn_constrain_environment(monkeypatch, db_request):
     claims_in_token = {"ref": "someref", "sha": "somesha", "environment": "fakeenv"}
     claims_input = {"ref": "someref", "sha": "somesha"}
     time = pretend.stub(time=pretend.call_recorder(lambda: 0))
@@ -794,10 +785,7 @@ def find_service(iface, **kw):
     ]
 
 
-def test_mint_token_with_prohibited_name_fails(
-    monkeypatch,
-    db_request
-):
+def test_mint_token_with_prohibited_name_fails(monkeypatch, db_request):
     prohibited_project_name = ProhibitedProjectFactory.create()
     user = UserFactory.create()
     PendingGitHubPublisherFactory.create(
@@ -836,10 +824,7 @@ def test_mint_token_with_prohibited_name_fails(
         )
 
 
-def test_mint_token_with_invalid_name_fails(
-    monkeypatch,
-    db_request
-):
+def test_mint_token_with_invalid_name_fails(monkeypatch, db_request):
     user = UserFactory.create()
     pending_publisher = PendingGitHubPublisherFactory.create(
         project_name="-foo-",

tests/unit/utils/test_wsgi.py

@@ -21,8 +21,8 @@
 from warehouse.ip_addresses.models import IpAddress
 from warehouse.utils import wsgi
 
+from ...common.constants import REMOTE_ADDR, REMOTE_ADDR_HASHED, REMOTE_ADDR_SALTED
 from ...common.db.ip_addresses import IpAddressFactory as DBIpAddressFactory
-from ...common.constants import REMOTE_ADDR, REMOTE_ADDR_SALTED, REMOTE_ADDR_HASHED
 
 
 class TestProxyFixer:
@@ -149,7 +149,10 @@ def test_skips_x_forwarded_when_not_enough(self):
         response = pretend.stub()
         app = pretend.call_recorder(lambda e, s: response)
 
-        environ = {"HTTP_X_FORWARDED_FOR": REMOTE_ADDR, "HTTP_SOME_OTHER_HEADER": "woop"}
+        environ = {
+            "HTTP_X_FORWARDED_FOR": REMOTE_ADDR,
+            "HTTP_SOME_OTHER_HEADER": "woop",
+        }
         start_response = pretend.stub()
 
         resp = wsgi.ProxyFixer(app, token=None, ip_salt=None, num_proxies=2)(