Skip to content

Commit

Permalink
refactor: file name changes
Browse files Browse the repository at this point in the history
renamed request_models to abc
  • Loading branch information
201st-Luka committed Aug 22, 2023
1 parent 79e1439 commit 2caded9
Show file tree
Hide file tree
Showing 53 changed files with 105 additions and 129 deletions.
2 changes: 1 addition & 1 deletion pyclasher/api/requests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
# labels
from .player_labels import PlayerLabelsRequest
from .player_rankings import PlayerRankingsRequest
from .request_models import RequestModel, IterRequestModel, request_id
from .abc import RequestModel, IterRequestModel, request_id
from .war_league import WarLeagueRequest
from .war_leagues import WarLeaguesRequest
2 changes: 1 addition & 1 deletion pyclasher/api/requests/builder_base_league.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import BuilderBaseLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/builder_base_league.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import BuilderBaseLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/builder_base_leagues.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import BuilderBaseLeagueList, BuilderBaseLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/builder_base_leagues.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import BuilderBaseLeagueList, BuilderBaseLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/capital_league.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import CapitalLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/capital_league.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import CapitalLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/capital_league_seasons.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import CapitalLeagueList, CapitalLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/capital_league_seasons.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import CapitalLeagueList, CapitalLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from asyncio import get_running_loop, run

from .request_models import RequestModel
from .abc import RequestModel
from ..models import Clan, BaseClan


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import Clan, BaseClan


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_builder_base_rankings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanBuilderBaseRanking, ClanBuilderBaseRankingList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_builder_base_rankings.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanBuilderBaseRanking, ClanBuilderBaseRankingList, Location


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_capital_raid_seasons.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanCapitalRaidSeasons, ClanCapitalRaidSeason


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_capital_raid_seasons.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanCapitalRaidSeasons, ClanCapitalRaidSeason


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_current_war.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from asyncio import get_running_loop, run

from .request_models import RequestModel
from .abc import RequestModel
from ..models import ClanWar, BaseClan


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_current_war.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Coroutine, Any

from .request_models import RequestModel
from .abc import RequestModel
from ..models import ClanWar, BaseClan


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_labels.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import LabelList, Label


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_labels.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import LabelList, Label


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_members.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanMember, ClanMemberList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_members.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanMember, ClanMemberList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_rankings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanRanking, ClanRankingList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_rankings.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanRanking, ClanRankingList, Location


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_search.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanList, WarFrequency, Locations, Labels, Clan


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_search.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanList, WarFrequency, Locations, Labels, Clan


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_war_log.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanWarLog, ClanWarLogEntry


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/clan_war_log.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import ClanWarLog, ClanWarLogEntry


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/gold_pass.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import GoldPassSeason


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/gold_pass.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import GoldPassSeason


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/league.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import League


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/league.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import League


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/league_season.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import PlayerRanking, PlayerRankingList, Season


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/league_season.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import PlayerRanking, PlayerRankingList, Leagues, Season


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/leagues.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import LeagueList, League


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/leagues.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import LeagueList, League


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/location.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import Location


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/location.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import Location


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/locations.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import Location, LocationList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/locations.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Self, Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import Location, LocationList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from asyncio import Future, get_running_loop, run
from urllib.parse import quote

from .request_models import RequestModel
from .abc import RequestModel
from ..models import Player, VerifyTokenRequest, VerifyTokenResponse
from ...utils.request_methods import RequestMethods
from ...exceptions import ClientIsNotRunning, ApiCode
Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Coroutine, Any

from .request_models import RequestModel
from .abc import RequestModel
from ..models import Player, VerifyTokenResponse


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player_builder_base_rankings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import PlayerBuilderBaseRanking, PlayerBuilderBaseRankingList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player_builder_base_rankings.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import PlayerBuilderBaseRanking, PlayerBuilderBaseRankingList, Location


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player_labels.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import LabelList, Label


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player_labels.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import LabelList, Label


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player_rankings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import PlayerRanking, PlayerRankingList


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/player_rankings.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import PlayerRanking, PlayerRankingList, Location


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/war_league.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import WarLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/war_league.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import RequestModel
from .abc import RequestModel
from ..models import WarLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/war_leagues.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import WarLeagueList, WarLeague


Expand Down
2 changes: 1 addition & 1 deletion pyclasher/api/requests/war_leagues.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Iterator

from .request_models import IterRequestModel
from .abc import IterRequestModel
from ..models import WarLeagueList, WarLeague


Expand Down
10 changes: 5 additions & 5 deletions pyclasher/client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from asyncio import run, create_task, get_running_loop, new_event_loop
from asyncio import create_task
from typing import Iterable
from urllib.parse import urlparse

Expand Down Expand Up @@ -83,10 +83,6 @@ async def from_login(cls, email, password, requests_per_second=5,
self.__temporary_session = True
return self

@property
def is_running(self) -> bool:
return self.__client_running

async def start(self, tokens=None):
if tokens is None:
tokens = self.__tokens
Expand Down Expand Up @@ -153,3 +149,7 @@ def __del__(self):
self.logger.warning("The client was still running, closed now.")

return

@property
def is_running(self) -> bool:
return self.__client_running
Loading

0 comments on commit 2caded9

Please sign in to comment.