Lint

Author: tuxuser

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.20.0
+    rev: v3.2.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]

requirements.txt

@@ -18,7 +18,7 @@ respx
 pre-commit==2.20.0
 pyupgrade==3.2.0
 black==22.10.0
-flake8==5.0.4
+flake8==3.9.2
 # flake8-docstrings==1.5.0
 pydocstyle==6.1.1
 bandit==1.7.4

tests/common.py

@@ -1,15 +1,16 @@
-import os
 import json
+import os
 
 TEST_PATH = os.path.dirname(__file__)
 
 
 def get_response(name):
     """Read a response file."""
-    with open(f"{TEST_PATH}/data/responses/{name}.json",encoding='utf8') as f:
+    with open(f"{TEST_PATH}/data/responses/{name}.json", encoding="utf8") as f:
         return f.read()
 
+
 def get_response_json(name):
     """Read a response file and return json dict."""
     text = get_response(name)
-    return json.loads(text)
+    return json.loads(text)

tests/conftest.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 
+from ecdsa.keys import SigningKey
 from httpx import AsyncClient
-import respx
-from ecdsa.keys import SigningKey, VerifyingKey
 import pytest
 import pytest_asyncio
 
@@ -19,6 +18,7 @@
 
 collect_ignore = ["setup.py"]
 
+
 @pytest_asyncio.fixture(scope="function")
 async def auth_mgr(event_loop):
     session = AsyncClient()
@@ -34,6 +34,7 @@ async def auth_mgr(event_loop):
 def xbl_client(auth_mgr):
     return XboxLiveClient(auth_mgr)
 
+
 @pytest.fixture(scope="session")
 def ecdsa_signing_key_str() -> str:
     with open("tests/data/test_signing_key.pem") as f:

tests/test_account.py

@@ -9,7 +9,9 @@
 
 @pytest.mark.asyncio
 async def test_claim_gamertag(respx_mock, xbl_client):
-    route = respx_mock.post("https://user.mgt.xboxlive.com").mock(return_value=Response(200))
+    route = respx_mock.post("https://user.mgt.xboxlive.com").mock(
+        return_value=Response(200)
+    )
     ret = await xbl_client.account.claim_gamertag("2669321029139235", "PrettyPony")
 
     assert ret == ClaimGamertagResult.Available
@@ -18,7 +20,9 @@ async def test_claim_gamertag(respx_mock, xbl_client):
 
 @pytest.mark.asyncio
 async def test_claim_gamertag_error(respx_mock, xbl_client):
-    route = respx_mock.post("https://user.mgt.xboxlive.com").mock(return_value=Response(500))
+    route = respx_mock.post("https://user.mgt.xboxlive.com").mock(
+        return_value=Response(500)
+    )
     with pytest.raises(HTTPStatusError) as err:
         await xbl_client.account.claim_gamertag("2669321029139235", "PrettyPony")
 
@@ -29,7 +33,9 @@ async def test_claim_gamertag_error(respx_mock, xbl_client):
 
 @pytest.mark.asyncio
 async def test_change_gamertag(respx_mock, xbl_client):
-    route = respx_mock.post("https://accounts.xboxlive.com").mock(return_value=Response(200))
+    route = respx_mock.post("https://accounts.xboxlive.com").mock(
+        return_value=Response(200)
+    )
     ret = await xbl_client.account.change_gamertag("2669321029139235", "PrettyPony")
 
     assert ret == ChangeGamertagResult.ChangeSuccessful
@@ -38,7 +44,9 @@ async def test_change_gamertag(respx_mock, xbl_client):
 
 @pytest.mark.asyncio
 async def test_change_gamertag_error(respx_mock, xbl_client):
-    route = respx_mock.post("https://accounts.xboxlive.com").mock(return_value=Response(500))
+    route = respx_mock.post("https://accounts.xboxlive.com").mock(
+        return_value=Response(500)
+    )
     with pytest.raises(HTTPStatusError) as err:
         await xbl_client.account.change_gamertag("2669321029139235", "PrettyPony")
 

tests/test_achievements.py

@@ -1,14 +1,14 @@
-import os
-
-import pytest
 from httpx import Response
+import pytest
 
 from tests.common import get_response_json
 
 
 @pytest.mark.asyncio
 async def test_achievement_360_all(respx_mock, xbl_client):
-    route = respx_mock.get("https://achievements.xboxlive.com").mock(return_value=Response(200, json=get_response_json("achievements_360_all")))
+    route = respx_mock.get("https://achievements.xboxlive.com").mock(
+        return_value=Response(200, json=get_response_json("achievements_360_all"))
+    )
 
     ret = await xbl_client.achievements.get_achievements_xbox360_all(
         "2669321029139235", 1297290392
@@ -20,65 +20,81 @@ async def test_achievement_360_all(respx_mock, xbl_client):
 
 @pytest.mark.asyncio
 async def test_achievement_360_earned(respx_mock, xbl_client):
-    route = respx_mock.get("https://achievements.xboxlive.com").mock(return_value=Response(200, json=get_response_json("achievements_360_earned")))
+    route = respx_mock.get("https://achievements.xboxlive.com").mock(
+        return_value=Response(200, json=get_response_json("achievements_360_earned"))
+    )
 
     ret = await xbl_client.achievements.get_achievements_xbox360_earned(
         "2669321029139235", 1297290392
     )
-    
+
     assert len(ret.achievements) == 1
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_achievement_360_recent_progress(respx_mock, xbl_client):
-    route = respx_mock.get("https://achievements.xboxlive.com").mock(return_value=Response(200, json=get_response_json("achievements_360_recent_progress")))
+    route = respx_mock.get("https://achievements.xboxlive.com").mock(
+        return_value=Response(
+            200, json=get_response_json("achievements_360_recent_progress")
+        )
+    )
 
     ret = (
         await xbl_client.achievements.get_achievements_xbox360_recent_progress_and_info(
             xuid="2669321029139235"
         )
     )
-    
+
     assert len(ret.titles) == 32
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_achievement_one_details(respx_mock, xbl_client):
-    route = respx_mock.get("https://achievements.xboxlive.com").mock(return_value=Response(200, json=get_response_json("achievements_one_details")))
+    route = respx_mock.get("https://achievements.xboxlive.com").mock(
+        return_value=Response(200, json=get_response_json("achievements_one_details"))
+    )
 
     ret = await xbl_client.achievements.get_achievements_detail_item(
         xuid="2669321029139235",
         service_config_id="1370999b-fca2-4c53-8ec5-73493bcb67e5",
         achievement_id="39",
     )
-    
+
     assert len(ret.achievements) == 1
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_achievement_one_gameprogress(respx_mock, xbl_client):
-    route = respx_mock.get("https://achievements.xboxlive.com").mock(return_value=Response(200, json=get_response_json("achievements_one_gameprogress")))
+    route = respx_mock.get("https://achievements.xboxlive.com").mock(
+        return_value=Response(
+            200, json=get_response_json("achievements_one_gameprogress")
+        )
+    )
 
     ret = await xbl_client.achievements.get_achievements_xboxone_gameprogress(
         xuid="2669321029139235", title_id=219630713
     )
-    
+
     assert len(ret.achievements) == 32
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_achievement_one_recent_progress(respx_mock, xbl_client):
-    route = respx_mock.get("https://achievements.xboxlive.com").mock(return_value=Response(200, json=get_response_json("achievements_one_recent_progress")))
+    route = respx_mock.get("https://achievements.xboxlive.com").mock(
+        return_value=Response(
+            200, json=get_response_json("achievements_one_recent_progress")
+        )
+    )
 
     ret = (
         await xbl_client.achievements.get_achievements_xboxone_recent_progress_and_info(
             xuid="2669321029139235"
         )
     )
-    
+
     assert len(ret.titles) == 32
     assert route.called

tests/test_auth.py

@@ -1,7 +1,8 @@
 from datetime import datetime, timedelta, timezone
 
-import pytest
 from httpx import Response
+import pytest
+
 from tests.common import get_response_json
 
 
@@ -20,9 +21,15 @@ async def test_generate_auth_url_with_state(auth_mgr):
 
 @pytest.mark.asyncio
 async def test_request_tokens(respx_mock, auth_mgr):
-    route1 = respx_mock.post("https://login.live.com").mock(return_value=Response(200, json=get_response_json("auth_oauth2_token")))
-    route2 = respx_mock.post("https://user.auth.xboxlive.com/user/authenticate").mock(return_value=Response(200, json=get_response_json("auth_user_token")))
-    route3 = respx_mock.post("https://xsts.auth.xboxlive.com/xsts/authorize").mock(return_value=Response(200, json=get_response_json("auth_xsts_token")))
+    route1 = respx_mock.post("https://login.live.com").mock(
+        return_value=Response(200, json=get_response_json("auth_oauth2_token"))
+    )
+    route2 = respx_mock.post("https://user.auth.xboxlive.com/user/authenticate").mock(
+        return_value=Response(200, json=get_response_json("auth_user_token"))
+    )
+    route3 = respx_mock.post("https://xsts.auth.xboxlive.com/xsts/authorize").mock(
+        return_value=Response(200, json=get_response_json("auth_xsts_token"))
+    )
     await auth_mgr.request_tokens("CODE")
     assert route1.called
     assert route2.called
@@ -37,9 +44,15 @@ async def test_refresh_tokens(respx_mock, auth_mgr):
     auth_mgr.user_token.not_after = expired
     auth_mgr.xsts_token.not_after = expired
 
-    route1 = respx_mock.post("https://login.live.com").mock(return_value=Response(200, json=get_response_json("auth_oauth2_token")))
-    route2 = respx_mock.post("https://user.auth.xboxlive.com/user/authenticate").mock(return_value=Response(200, json=get_response_json("auth_user_token")))
-    route3 = respx_mock.post("https://xsts.auth.xboxlive.com/xsts/authorize").mock(return_value=Response(200, json=get_response_json("auth_xsts_token")))
+    route1 = respx_mock.post("https://login.live.com").mock(
+        return_value=Response(200, json=get_response_json("auth_oauth2_token"))
+    )
+    route2 = respx_mock.post("https://user.auth.xboxlive.com/user/authenticate").mock(
+        return_value=Response(200, json=get_response_json("auth_user_token"))
+    )
+    route3 = respx_mock.post("https://xsts.auth.xboxlive.com/xsts/authorize").mock(
+        return_value=Response(200, json=get_response_json("auth_xsts_token"))
+    )
     await auth_mgr.refresh_tokens()
     assert route1.called
     assert route2.called
@@ -63,16 +76,22 @@ async def test_refresh_tokens_user_still_valid(respx_mock, auth_mgr):
     auth_mgr.xsts_token.not_after = expired
 
     auth_mgr.user_token.not_after = datetime.now(timezone.utc) + timedelta(days=1)
-    route1 = respx_mock.post("https://login.live.com").mock(return_value=Response(200, json=get_response_json("auth_oauth2_token")))
-    route2 = respx_mock.post("https://xsts.auth.xboxlive.com/xsts/authorize").mock(return_value=Response(200, json=get_response_json("auth_xsts_token")))
+    route1 = respx_mock.post("https://login.live.com").mock(
+        return_value=Response(200, json=get_response_json("auth_oauth2_token"))
+    )
+    route2 = respx_mock.post("https://xsts.auth.xboxlive.com/xsts/authorize").mock(
+        return_value=Response(200, json=get_response_json("auth_xsts_token"))
+    )
     await auth_mgr.refresh_tokens()
     assert route1.called
     assert route2.called
 
 
 @pytest.mark.asyncio
 async def test_get_title_endpoints(respx_mock, auth_mgr):
-    route = respx_mock.get("https://title.mgt.xboxlive.com").mock(return_value=Response(200, json=get_response_json("auth_title_endpoints")))
+    route = respx_mock.get("https://title.mgt.xboxlive.com").mock(
+        return_value=Response(200, json=get_response_json("auth_title_endpoints"))
+    )
     await auth_mgr.get_title_endpoints()
     assert route.called
 

tests/test_catalog.py

@@ -1,57 +1,70 @@
-import pytest
 from httpx import Response
+import pytest
+
 from xbox.webapi.api.provider.catalog.models import AlternateIdType, FieldsTemplate
 
 from tests.common import get_response_json
 
 
 @pytest.mark.asyncio
 async def test_get_products(respx_mock, xbl_client):
-    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(return_value=Response(200, json=get_response_json("catalog_browse")))
+    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(
+        return_value=Response(200, json=get_response_json("catalog_browse"))
+    )
     ret = await xbl_client.catalog.get_products(["C5DTJ99626K3", "BT5P2X999VH2"])
-    
+
     assert len(ret.products) == 2
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_get_products_detail(respx_mock, xbl_client):
-    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(return_value=Response(200, json=get_response_json("catalog_browse_details")))
+    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(
+        return_value=Response(200, json=get_response_json("catalog_browse_details"))
+    )
 
     ret = await xbl_client.catalog.get_products(
         ["C5DTJ99626K3", "BT5P2X999VH2"], fields=FieldsTemplate.DETAILS
     )
-    
+
     assert len(ret.products) == 2
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_get_product_from_alternate_id(respx_mock, xbl_client):
-    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(return_value=Response(200, json=get_response_json("catalog_product_lookup")))
+    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(
+        return_value=Response(200, json=get_response_json("catalog_product_lookup"))
+    )
     ret = await xbl_client.catalog.get_product_from_alternate_id(
         "4DF9E0F8.Netflix_mcm4njqhnhss8", AlternateIdType.PACKAGE_FAMILY_NAME
     )
-    
+
     assert ret.total_result_count == 1
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_get_product_from_alternate_id_legacy(respx_mock, xbl_client):
-    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(return_value=Response(200, json=get_response_json("catalog_product_lookup_legacy")))
+    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(
+        return_value=Response(
+            200, json=get_response_json("catalog_product_lookup_legacy")
+        )
+    )
     ret = await xbl_client.catalog.get_product_from_alternate_id(
         "71e7df12-89e0-4dc7-a5ff-a182fc2df94f", AlternateIdType.LEGACY_XBOX_PRODUCT_ID
     )
-    
+
     assert ret.total_result_count == 1
     assert route.called
 
 
 @pytest.mark.asyncio
 async def test_product_search(respx_mock, xbl_client):
-    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(return_value=Response(200, json=get_response_json("catalog_search")))
+    route = respx_mock.get("https://displaycatalog.mp.microsoft.com").mock(
+        return_value=Response(200, json=get_response_json("catalog_search"))
+    )
     ret = await xbl_client.catalog.product_search("dest")
-    
+
     assert ret.total_result_count == 10
     assert route.called