Enable ruff PLR rule (#37)

Author: tr4nt0r

pyproject.toml

@@ -48,14 +48,14 @@ line-length = 88
 target-version = "py311"
 
 [tool.ruff.lint]
-select = ["E4", "E7", "E9", "F", "UP", "S", "ANN", "C4", "I", "RUF", "SIM"]
+select = ["E4", "E7", "E9", "F", "UP", "S", "ANN", "C4", "I", "RUF", "SIM", "PLR"]
 # select = ["ALL"]
 ignore = ["ANN003", "ANN401", "D", "COM"]
 
 
 [tool.ruff.lint.per-file-ignores]
-"**/scripts/*" = ["UP", "S104", "ALL"]
-"tests/*" = ["S101"]
+"**/scripts/*" = ["UP", "S104"]
+"tests/*" = ["S101", "PLR2004"]
 "src/pythonxbox/authentication/xal.py" = ["S101"]
 
 [tool.ruff.lint.isort]

src/pythonxbox/api/provider/cqs/__init__.py

@@ -48,7 +48,7 @@ async def get_channel_list(
         resp.raise_for_status()
         return CqsChannelListResponse(**resp.json())
 
-    async def get_schedule(
+    async def get_schedule(  # noqa: PLR0913
         self,
         locale_info: str,
         headend_id: str,

src/pythonxbox/api/provider/message/__init__.py

@@ -4,6 +4,7 @@
 TODO: Support group messaging
 """
 
+from http import HTTPStatus
 from typing import ClassVar
 
 from pythonxbox.api.provider.baseprovider import BaseProvider
@@ -13,6 +14,8 @@
     SendMessageResponse,
 )
 
+MESSAGE_MAX_LEN = 256
+
 
 class MessageProvider(BaseProvider):
     MSG_URL = "https://xblmessaging.xboxlive.com"
@@ -82,7 +85,7 @@ async def delete_conversation(
         resp = await self.client.session.put(
             url, json=post_data, headers=self.HEADERS_HORIZON, **kwargs
         )
-        return resp.status_code == 200
+        return resp.status_code == HTTPStatus.OK
 
     async def delete_message(
         self, conversation_id: str, message_id: str, **kwargs
@@ -102,7 +105,7 @@ async def delete_message(
         resp = await self.client.session.delete(
             url, headers=self.HEADERS_MESSAGE, **kwargs
         )
-        return resp.status_code == 200
+        return resp.status_code == HTTPStatus.OK
 
     async def send_message(
         self, xuid: str, message_text: str, **kwargs
@@ -117,8 +120,10 @@ async def send_message(
         Returns:
             :class:`SendMessageResponse`: Send Message Response
         """
-        if len(message_text) > 256:
-            raise ValueError("Message text exceeds max length of 256 chars")
+        if len(message_text) > MESSAGE_MAX_LEN:
+            raise ValueError(
+                f"Message text exceeds max length of {MESSAGE_MAX_LEN} chars"
+            )
 
         url = f"{self.MSG_URL}/network/Xbox/users/me/conversations/users/xuid({xuid})"
         post_data = {

src/pythonxbox/api/provider/presence/__init__.py

@@ -2,6 +2,7 @@
 Presence - Get online status of friends
 """
 
+from http import HTTPStatus
 from typing import ClassVar
 
 from pythonxbox.api.provider.baseprovider import BaseProvider
@@ -61,7 +62,9 @@ async def get_presence_batch(
 
         Returns: List[:class:`PresenceItem`]: List of presence items
         """
-        if len(xuids) > 1100:
+        MAX_XUIDS = 1100
+
+        if len(xuids) > MAX_XUIDS:
             raise Exception("Xuid list length is > 1100")
 
         url = self.PRESENCE_URL + "/users/batch"
@@ -112,4 +115,4 @@ async def set_presence_own(self, presence_state: PresenceState, **kwargs) -> boo
         resp = await self.client.session.put(
             url, json=data, headers=self.HEADERS_PRESENCE, **kwargs
         )
-        return resp.status_code == 200
+        return resp.status_code == HTTPStatus.OK

src/pythonxbox/api/provider/userstats/__init__.py

@@ -3,6 +3,7 @@
 """
 
 from typing import ClassVar
+
 from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider
 from pythonxbox.api.provider.userstats.models import (
     GeneralStatsField,

src/pythonxbox/authentication/manager.py

@@ -4,6 +4,7 @@
 Authenticate with Windows Live Server and Xbox Live.
 """
 
+from http import HTTPStatus
 import logging
 
 import httpx
@@ -152,7 +153,7 @@ async def request_xsts_token(
         }
 
         resp = await self.session.post(url, json=data, headers=headers)
-        if resp.status_code == 401:  # if unauthorized
+        if resp.status_code == HTTPStatus.UNAUTHORIZED:  # if unauthorized
             print(
                 "Failed to authorize you! Your password or username may be wrong or you are trying to use child account (< 18 years old)"
             )

src/pythonxbox/authentication/xal.py

@@ -95,12 +95,16 @@ def _get_random_bytes(length: int) -> bytes:
     @staticmethod
     def _generate_code_verifier() -> str:
         # https://tools.ietf.org/html/rfc7636
+        MIN_LEN = 43
+        MAX_LEN = 128
+
         code_verifier = (
             base64.urlsafe_b64encode(XALManager._get_random_bytes(32))
             .decode()
             .rstrip("=")
         )
-        assert len(code_verifier) >= 43 and len(code_verifier) <= 128
+        if not (MIN_LEN <= len(code_verifier) <= MAX_LEN):
+            raise ValueError(f"Invalid code_verifier length: {len(code_verifier)}")
 
         return code_verifier
 

src/pythonxbox/common/request_signer.py

@@ -151,7 +151,7 @@ def _hash(data: bytes) -> bytes:
         return hash.digest()
 
     @staticmethod
-    def _concat_data_to_sign(
+    def _concat_data_to_sign(  # noqa: PLR0913
         signature_version: bytes,
         method: str,
         path_and_query: str,

src/pythonxbox/scripts/change_gamertag.py

@@ -19,6 +19,8 @@
 from pythonxbox.common.signed_session import SignedSession
 from pythonxbox.scripts import CLIENT_ID, CLIENT_SECRET, TOKENS_FILE
 
+GAMERTAG_MAX_LEN = 15
+
 
 async def async_main() -> None:
     parser = argparse.ArgumentParser(description="Change your gamertag")
@@ -44,8 +46,8 @@ async def async_main() -> None:
 
     args = parser.parse_args()
 
-    if len(args.gamertag) > 15:
-        print("Desired gamertag exceedes limit of 15 chars")
+    if len(args.gamertag) > GAMERTAG_MAX_LEN:
+        print(f"Desired gamertag exceedes limit of {GAMERTAG_MAX_LEN} chars")
         sys.exit(-1)
 
     if not os.path.exists(args.tokens):