fix: mypy 38 typing

Author: zombyacoff

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.12", "3.14"]
+        python-version: ["3.8", "3.10", "3.12", "3.14"]
 
     steps:
       - uses: actions/checkout@v4

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "faceit"
-version = "0.2.2"
+version = "0.2.3"
 description = "The Python wrapper for the FACEIT API"
 readme = "README.md"
 requires-python = ">=3.8"

src/faceit/api/base.py

@@ -21,8 +21,6 @@
 )
 from faceit.utils import warn_stacklevel
 
-from .pagination import AsyncPageIterator, SyncPageIterator
-
 if typing.TYPE_CHECKING:
     _ResponseT = typing.TypeVar("_ResponseT", bound=RawAPIResponse)
 
@@ -66,9 +64,6 @@ class BaseResource(ABC, typing.Generic[ClientT]):
         "category": "type",
     })
 
-    _sync_page_iterator: typing.ClassVar = SyncPageIterator
-    _async_page_iterator: typing.ClassVar = AsyncPageIterator
-
     def __init__(
         self,
         client: ClientT,

src/faceit/api/data/championships.py

@@ -7,7 +7,12 @@
 from typing_extensions import Annotated, TypeAlias
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItemsType, pages
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItemsType,
+    SyncPageIterator,
+    pages,
+)
 from faceit.constants import EventCategory, ExpandedField, GameID
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import Championship, ItemPage
@@ -106,9 +111,7 @@ def all_items(
         category: EventCategory = EventCategory.ALL,
         max_items: MaxItemsType = pages(30),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Championship]]:
-        iterator = self.__class__._sync_page_iterator(
-            self.items, game, category, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.items, game, category, max_items=max_items)
         return iterator.collect()
 
     @typing.overload
@@ -327,9 +330,7 @@ async def all_items(
         category: EventCategory = EventCategory.ALL,
         max_items: MaxItemsType = pages(30),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Championship]]:
-        iterator = self.__class__._async_page_iterator(
-            self.items, game, category, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.items, game, category, max_items=max_items)
         return await iterator.collect()
 
     @typing.overload

src/faceit/api/data/games.py

@@ -6,7 +6,12 @@
 from pydantic import Field, validate_call
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItems, MaxItemsType
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItems,
+    MaxItemsType,
+    SyncPageIterator,
+)
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import ItemPage  # noqa: TC001
 from faceit.types import (
@@ -77,7 +82,7 @@ def all_items(
     def all_items(
         self, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        iterator = self.__class__._sync_page_iterator(self.items, max_items=max_items)
+        iterator = SyncPageIterator(self.items, max_items=max_items)
         return iterator.collect()
 
 
@@ -130,5 +135,5 @@ async def all_items(
     async def all_items(
         self, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        iterator = self.__class__._async_page_iterator(self.items, max_items=max_items)
+        iterator = AsyncPageIterator(self.items, max_items=max_items)
         return await iterator.collect()

src/faceit/api/data/players.py

@@ -14,8 +14,10 @@
     RequestPayload,
 )
 from faceit.api.pagination import (
+    AsyncPageIterator,
     MaxItems,
     MaxItemsType,
+    SyncPageIterator,
     TimestampPaginationConfig,
     pages,
 )
@@ -236,9 +238,7 @@ def all_bans(
     def all_bans(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[BanEntry]]:
-        iterator = self.__class__._sync_page_iterator(
-            self.bans, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.bans, player_id, max_items=max_items)
         return iterator.collect()
 
     @typing.overload
@@ -341,8 +341,8 @@ def all_matches_stats(
         ItemPage[CS2MatchPlayerStats],
         ItemPage[AbstractMatchPlayerStats],
     ]:
-        return self.__class__._sync_page_iterator.gather_from_iterator(
-            self.__class__._sync_page_iterator.unix(
+        return SyncPageIterator.gather_from_iterator(
+            SyncPageIterator.unix(
                 self.matches_stats,
                 player_id,
                 game,
@@ -419,8 +419,8 @@ def all_history(
         game: GameID,
         max_items: MaxItemsType = pages(50),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Match]]:
-        return self.__class__._sync_page_iterator.gather_from_iterator(
-            self.__class__._sync_page_iterator.unix(
+        return SyncPageIterator.gather_from_iterator(
+            SyncPageIterator.unix(
                 self.history,
                 player_id,
                 game,
@@ -481,9 +481,7 @@ def all_hubs(
     def all_hubs(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Hub]]:
-        iterator = self.__class__._sync_page_iterator(
-            self.hubs, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.hubs, player_id, max_items=max_items)
         return iterator.collect()
 
     @typing.overload
@@ -566,9 +564,7 @@ def all_teams(
     def all_teams(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[GeneralTeam]]:
-        iterator = self.__class__._sync_page_iterator(
-            self.teams, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.teams, player_id, max_items=max_items)
         return iterator.collect()
 
     @typing.overload
@@ -623,9 +619,7 @@ def all_tournaments(
     def all_tournaments(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Tournament]]:
-        iterator = self.__class__._sync_page_iterator(
-            self.tournaments, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.tournaments, player_id, max_items=max_items)
         return iterator.collect()
 
 
@@ -723,9 +717,7 @@ async def all_bans(
     async def all_bans(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[BanEntry]]:
-        iterator = self.__class__._async_page_iterator(
-            self.bans, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.bans, player_id, max_items=max_items)
         return await iterator.collect()
 
     @typing.overload
@@ -825,8 +817,8 @@ async def all_matches_stats(
         ItemPage[AbstractMatchPlayerStats],
         ItemPage[CS2MatchPlayerStats],
     ]:
-        return await self.__class__._async_page_iterator.gather_from_iterator(
-            self.__class__._async_page_iterator.unix(
+        return await AsyncPageIterator.gather_from_iterator(
+            AsyncPageIterator.unix(
                 self.matches_stats,
                 player_id,
                 game,
@@ -903,8 +895,8 @@ async def all_history(
         game: GameID,
         max_items: MaxItemsType = pages(50),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Match]]:
-        return await self.__class__._async_page_iterator.gather_from_iterator(
-            self.__class__._async_page_iterator.unix(
+        return await AsyncPageIterator.gather_from_iterator(
+            AsyncPageIterator.unix(
                 self.history,
                 player_id,
                 game,
@@ -965,9 +957,7 @@ async def all_hubs(
     async def all_hubs(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Hub]]:
-        iterator = self.__class__._async_page_iterator(
-            self.hubs, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.hubs, player_id, max_items=max_items)
         return await iterator.collect()
 
     @typing.overload
@@ -1050,9 +1040,7 @@ async def all_teams(
     async def all_teams(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[GeneralTeam]]:
-        iterator = self.__class__._async_page_iterator(
-            self.teams, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.teams, player_id, max_items=max_items)
         return await iterator.collect()
 
     @typing.overload
@@ -1107,7 +1095,5 @@ async def all_tournaments(
     async def all_tournaments(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Tournament]]:
-        iterator = self.__class__._async_page_iterator(
-            self.tournaments, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.tournaments, player_id, max_items=max_items)
         return await iterator.collect()

src/faceit/api/data/rankings.py

@@ -6,7 +6,12 @@
 from pydantic import Field, validate_call
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItemsType, pages
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItemsType,
+    SyncPageIterator,
+    pages,
+)
 from faceit.constants import GameID  # noqa: TC001
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import ItemPage  # noqa: TC001
@@ -106,7 +111,7 @@ def all_unbounded(
         country: typing.Optional[CountryCode] = None,
         max_items: MaxItemsType = pages(10),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        iterator = self.__class__._sync_page_iterator(
+        iterator = SyncPageIterator(
             self.unbounded, game, region, country, max_items=max_items
         )
         return iterator.collect()
@@ -230,7 +235,7 @@ async def all_unbounded(
         country: typing.Optional[CountryCode] = None,
         max_items: MaxItemsType = pages(10),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        iterator = self.__class__._async_page_iterator(
+        iterator = AsyncPageIterator(
             self.unbounded, game, region, country, max_items=max_items
         )
         return await iterator.collect()

src/faceit/api/data/teams.py

@@ -7,7 +7,12 @@
 from typing_extensions import Annotated, TypeAlias
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItemsType, pages
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItemsType,
+    SyncPageIterator,
+    pages,
+)
 from faceit.constants import GameID  # noqa: TC001
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import ItemPage  # noqa: TC001
@@ -124,9 +129,7 @@ def all_tournaments(
     def all_tournaments(
         self, team_id: _TeamIDValidated, max_items: MaxItemsType = pages(30)
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        iterator = self.__class__._sync_page_iterator(
-            self.tournaments, team_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.tournaments, team_id, max_items=max_items)
         return iterator.collect()
 
 
@@ -221,7 +224,5 @@ async def all_tournaments(
     async def all_tournaments(
         self, team_id: _TeamIDValidated, max_items: MaxItemsType = pages(30)
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        iterator = self.__class__._async_page_iterator(
-            self.tournaments, team_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.tournaments, team_id, max_items=max_items)
         return await iterator.collect()

src/faceit/utils.py

@@ -2,14 +2,14 @@
 
 import inspect
 import json
-import os
 import reprlib
 import sys
 import typing
 from contextlib import suppress
 from enum import Enum, auto
 from functools import lru_cache, reduce, wraps
 from hashlib import sha256
+from pathlib import Path
 from uuid import UUID
 
 from typing_extensions import Self, TypeIs, deprecated
@@ -222,22 +222,20 @@ def validate_positive_int(value: typing.Any, /, param_name: str = "value") -> in
 
 @lru_cache(maxsize=1)
 def _get_ignored_paths() -> typing.Tuple[
-    typing.Tuple[str, ...],
-    typing.FrozenSet[str],
+    typing.Tuple[Path, ...],
+    typing.FrozenSet[Path],
 ]:
-    prefixes: typing.List[str] = []
-    files: typing.Set[str] = set()
+    prefixes: typing.List[Path] = []
+    files: typing.Set[Path] = set()
 
     for mod_name in (__name__.split(".")[0], *_IGNORED_MODULES):
         mod = sys.modules.get(mod_name)
         if mod is None or not hasattr(mod, "__file__") or mod.__file__ is None:
             continue
 
-        path = os.path.normcase(os.path.realpath(mod.__file__))
-
-        if path.endswith("__init__.py"):
-            dir_path = os.path.dirname(path) + os.sep  # noqa: PTH120
-            prefixes.append(dir_path)
+        path = Path(mod.__file__).resolve()
+        if path.name == "__init__.py":
+            prefixes.append(path.parent)
         else:
             files.add(path)
 
@@ -257,10 +255,10 @@ def warn_stacklevel() -> int:
         while frame:
             filename = frame.f_code.co_filename
             if filename and not filename.startswith("<"):
-                norm_path = os.path.normcase(os.path.realpath(filename))
-                is_user_code = (
-                    norm_path not in ignored_files
-                    and not norm_path.startswith(ignored_prefixes)
+                path = Path(filename).resolve()
+                is_user_code = path not in ignored_files and not any(
+                    prefix in path.parents or path == prefix
+                    for prefix in ignored_prefixes
                 )
                 if is_user_code:
                     return level