refactor: fixed imports (optimized)

pyclasher/__init__.py

@@ -11,3 +11,16 @@
 
 __version__ = '1.0.0-alpha1'
 
+# api
+from .api import *
+
+# utils
+from .utils import *
+
+# client.py
+from .client import RequestMethods, Status, Auth, Developer, Login, RequestQueue, Consumer, PyClasherClient
+
+# exceptions.py
+from .exceptions import (Missing, MISSING, PyClasherException, ApiCode, RequestNotDone, NoneToken, InvalidLoginData,
+ InvalidType, LoginNotDone, ClientIsRunning, ClientIsNotRunning, ClientAlreadyInitialised,
+ NoClient, InvalidTimeFormat, ClientRunningOverwrite, InvalidSeasonFormat, RequestTimeout)

pyclasher/api/__init__.py

@@ -0,0 +1,3 @@
+from .bulk_requests import *
+from .models import *
+from .requests import *

pyclasher/api/bulk_requests/BulkPlayer.py

@@ -1,10 +1,10 @@
 from asyncio import get_running_loop, run
 
-from Exceptions import MISSING
-from api.models import Clan
 from .BulkRequestModel import BulkRequestModel
-from api.models import BaseClan
-from api.requests import PlayerRequest, ClanMembersRequest
+from ..models import BaseClan
+from ..models import Clan
+from ..requests import PlayerRequest, ClanMembersRequest
+from ...exceptions import MISSING
 
 
 class PlayerBulkRequest(BulkRequestModel):

pyclasher/api/bulk_requests/BulkPlayer.pyi

@@ -1,7 +1,8 @@
 from typing import Iterable, Coroutine, Any, Iterator
 
 from .BulkRequestModel import BulkRequestModel
-from ..models import BaseClan, ClanMemberList, ClanWarMemberList, ClanWarLeagueClanMemberList, ClanCapitalRaidSeasonMemberList
+from ..models import BaseClan, ClanMemberList, ClanWarMemberList, ClanWarLeagueClanMemberList, \
+ ClanCapitalRaidSeasonMemberList
 from ..requests import PlayerRequest, ClanMembersRequest
 
 

pyclasher/api/bulk_requests/BulkRequestModel.py

@@ -1,7 +1,5 @@
 from asyncio import gather, get_running_loop, run
 
-from Exceptions import RequestNotDone
-
 
 class BulkRequestModel:
  _request_model = ...

pyclasher/api/models/BaseModels.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Any
 
-from Exceptions import RequestNotDone, InvalidTimeFormat, MISSING
+from ...exceptions import RequestNotDone, InvalidTimeFormat, MISSING
 
 
 class BaseModel:

pyclasher/api/models/BaseModels.pyi

@@ -4,7 +4,7 @@ base models for this API wrapper client
 
 from typing import Any, Iterator, Generator
 
-from ..Exceptions import MISSING, Missing
+from ...exceptions import MISSING, Missing
 
 
 class BaseModel:

pyclasher/api/models/Clan.pyi

@@ -9,8 +9,8 @@ from .Enums import WarFrequency, ClanType
 from .Labels import LabelList
 from .Leagues import WarLeague, CapitalLeague
 from .Location import Location
-from api.models.misc import Language
-from ..Exceptions import Missing
+from .misc import Language
+from ...exceptions import Missing
 
 
 class ClanDistrictData(BaseModel):

pyclasher/api/models/ClanCapitalRaidSeasons.pyi

@@ -1,7 +1,7 @@
 from typing import Iterator
 
-from ..Exceptions import Missing
 from .BaseModels import BaseModel, IterBaseModel, BaseClanMember, BaseClan, Time
+from ...exceptions import Missing
 
 
 class ClanCapitalRaidSeasonClanInfo(BaseClan):

pyclasher/api/models/ClanMember.pyi

@@ -1,8 +1,8 @@
-from ..Exceptions import Missing
 from .BaseModels import BaseClanMember
 from .Enums import ClanRole
 from .Leagues import League, BuilderBaseLeague
 from .PlayerHouse import PlayerHouse
+from ...exceptions import Missing
 
 
 class ClanMember(BaseClanMember):

pyclasher/api/models/Enums.py

@@ -3,7 +3,7 @@
 from .Labels import Label
 from .Leagues import League, CapitalLeague, BuilderBaseLeague, WarLeague
 from .Location import Location
-from Exceptions import ApiCode
+from ...exceptions import ApiCode
 
 
 class ApiCodes(Enum):

pyclasher/api/models/Enums.pyi

@@ -3,7 +3,7 @@ from enum import Enum
 from .Labels import Label
 from .Leagues import League, CapitalLeague, BuilderBaseLeague, WarLeague
 from .Location import Location
-from ..Exceptions import ApiCode
+from ...exceptions import ApiCode
 
 
 class ApiCodes(Enum):

pyclasher/api/models/GoldPassSeason.py

@@ -1,4 +1,4 @@
-from api.models import Time, BaseModel
+from .BaseModels import Time, BaseModel
 
 
 class GoldPassSeason(BaseModel):

pyclasher/api/models/GoldPassSeason.pyi

@@ -1,4 +1,4 @@
-from api.models import Time, BaseModel
+from .BaseModels import Time, BaseModel
 
 
 class GoldPassSeason(BaseModel):

pyclasher/api/models/Labels.py

@@ -1,4 +1,4 @@
-from api.models import BaseModel, IterBaseModel, IconUrls
+from .BaseModels import BaseModel, IterBaseModel, IconUrls
 
 
 class Label(BaseModel):

pyclasher/api/models/Labels.pyi

@@ -1,6 +1,6 @@
 from typing import Iterator
 
-from api.models import BaseModel, IterBaseModel, IconUrls
+from .BaseModels import BaseModel, IterBaseModel, IconUrls
 
 
 class Label(BaseModel):

pyclasher/api/models/Location.pyi

@@ -4,7 +4,7 @@ models concerning the location
 from typing import Iterator
 
 from .BaseModels import IterBaseModel, BaseModel
-from ..Exceptions import Missing
+from ...exceptions import Missing
 
 
 class Location(BaseModel):

pyclasher/api/models/Player.pyi

@@ -1,11 +1,11 @@
 from typing import Iterator
 
-from ..Exceptions import Missing
 from .BaseModels import BaseModel, IterBaseModel, BaseClan
 from .Enums import ClanRole, WarPreference, Village
 from .Labels import LabelList
 from .Leagues import League, BuilderBaseLeague
 from .PlayerHouse import PlayerHouse
+from ...exceptions import Missing
 
 
 class PlayerClan(BaseClan):

pyclasher/api/models/PlayerBuilderBaseRankingList.pyi

@@ -2,7 +2,7 @@ from typing import Iterator
 
 from .BaseModels import BaseModel, IterBaseModel
 from .Leagues import BuilderBaseLeague
-from api.models.PlayerRankingClan import PlayerRankingClan
+from .PlayerRankingClan import PlayerRankingClan
 
 
 class PlayerBuilderBaseRanking(BaseModel):

pyclasher/api/models/PlayerRankingList.pyi

@@ -2,7 +2,7 @@ from typing import Iterator
 
 from .BaseModels import BaseModel, IterBaseModel
 from .Leagues import League
-from api.models.PlayerRankingClan import PlayerRankingClan
+from .PlayerRankingClan import PlayerRankingClan
 
 
 class PlayerRanking(BaseModel):

pyclasher/api/models/Season.py

@@ -1,4 +1,4 @@
-from Exceptions import InvalidSeasonFormat
+from ...exceptions import InvalidSeasonFormat
 
 
 class Season:

pyclasher/api/models/__init__.py

@@ -7,14 +7,14 @@
  Cursor, Paging, BadgeUrl, BadgeUrls, Time, BaseClanMember, BaseClan, BaseLeague
 # clan models
 from .Clan import ClanDistrictData, ClanDistrictDataList, ClanCapital, Clan
-from .ClanList import ClanList
 from .ClanBuilderBaseRankingList import ClanBuilderBaseRanking, ClanBuilderBaseRankingList
 from .ClanCapitalRaidSeasons import ClanCapitalRaidSeasonClanInfo, ClanCapitalRaidSeasonAttacker, \
  ClanCapitalRaidSeasonAttack, ClanCapitalRaidSeasonAttackList, ClanCapitalRaidSeasonDistrict, \
  ClanCapitalRaidSeasonDistrictList, ClanCapitalRaidSeasonDefenseLogEntry, ClanCapitalRaidSeasonAttackLogEntry, \
  ClanCapitalRaidSeasonDefenseLogList, ClanCapitalRaidSeasonAttackLogList, ClanCapitalRaidSeasonMember, \
  ClanCapitalRaidSeasonMemberList, ClanCapitalRaidSeason, ClanCapitalRaidSeasons
 from .ClanCapitalRankingList import ClanCapitalRanking, ClanCapitalRankingList
+from .ClanList import ClanList
 from .ClanMember import ClanMember
 from .ClanMemberList import ClanMemberList
 from .ClanRankingList import ClanRanking, ClanRankingList

pyclasher/api/models/misc/Api.pyi

@@ -3,7 +3,7 @@ models concerning the ClashOfClans API responses
 """
 
 from ..BaseModels import BaseModel
-from ...Exceptions import Missing
+from ....exceptions import Missing
 
 
 class ClientError(BaseModel):

pyclasher/api/requests/BuilderBaseLeague.py

@@ -1,5 +1,5 @@
 from .RequestModels import RequestModel
-from api.models import BuilderBaseLeague
+from ..models import BuilderBaseLeague
 
 
 class BuilderBaseLeagueRequest(RequestModel, BuilderBaseLeague):

pyclasher/api/requests/BuilderBaseLeagues.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import BuilderBaseLeagueList, BuilderBaseLeague
+from ..models import BuilderBaseLeagueList, BuilderBaseLeague
 
 
 class BuilderBaseLeaguesRequest(IterRequestModel):

pyclasher/api/requests/CapitalLeague.py

@@ -1,5 +1,5 @@
 from .RequestModels import RequestModel
-from api.models import CapitalLeague
+from ..models import CapitalLeague
 
 
 class CapitalLeagueRequest(RequestModel, CapitalLeague):

pyclasher/api/requests/CapitalLeagueSeasons.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import CapitalLeagueList, CapitalLeague
+from ..models import CapitalLeagueList, CapitalLeague
 
 
 class CapitalLeaguesRequest(IterRequestModel):

pyclasher/api/requests/Clan.py

@@ -1,7 +1,7 @@
 from asyncio import get_running_loop, run
 
 from .RequestModels import RequestModel
-from api.models import Clan, BaseClan
+from ..models import Clan, BaseClan
 
 
 class ClanRequest(RequestModel, Clan):

pyclasher/api/requests/ClanBuilderBaseRankings.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import ClanBuilderBaseRanking, ClanBuilderBaseRankingList
+from ..models import ClanBuilderBaseRanking, ClanBuilderBaseRankingList
 
 
 class ClanBuilderBaseRankingsRequest(IterRequestModel):

pyclasher/api/requests/ClanCapitalRaidSeasons.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import ClanCapitalRaidSeasons, ClanCapitalRaidSeason
+from ..models import ClanCapitalRaidSeasons, ClanCapitalRaidSeason
 
 
 class ClanCapitalRaidSeasonsRequest(IterRequestModel):

pyclasher/api/requests/ClanCurrentWar.py

@@ -1,7 +1,7 @@
 from asyncio import get_running_loop, run
 
 from .RequestModels import RequestModel
-from api.models import ClanWar, BaseClan
+from ..models import ClanWar, BaseClan
 
 
 class ClanCurrentWarRequest(RequestModel, ClanWar):

pyclasher/api/requests/ClanLabels.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import LabelList, Label
+from ..models import LabelList, Label
 
 
 class ClanLabelsRequest(IterRequestModel):

pyclasher/api/requests/ClanMembers.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import ClanMember, ClanMemberList
+from ..models import ClanMember, ClanMemberList
 
 
 class ClanMembersRequest(IterRequestModel):

pyclasher/api/requests/ClanRankings.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import ClanRanking, ClanRankingList
+from ..models import ClanRanking, ClanRankingList
 
 
 class ClanRankingsRequest(IterRequestModel):

pyclasher/api/requests/ClanSearch.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import ClanList, WarFrequency, Locations, Labels, Clan
+from ..models import ClanList, WarFrequency, Locations, Labels, Clan
 
 
 class ClanSearchRequest(IterRequestModel):

pyclasher/api/requests/ClanWarLog.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import ClanWarLog, ClanWarLogEntry
+from ..models import ClanWarLog, ClanWarLogEntry
 
 
 class ClanWarLogRequest(IterRequestModel):

pyclasher/api/requests/GoldPass.py

@@ -1,5 +1,5 @@
 from .RequestModels import RequestModel
-from api.models import GoldPassSeason
+from ..models import GoldPassSeason
 
 
 class GoldPassRequest(RequestModel, GoldPassSeason):

pyclasher/api/requests/League.py

@@ -1,5 +1,5 @@
 from .RequestModels import RequestModel
-from api.models import League
+from ..models import League
 
 
 class LeagueRequest(RequestModel, League):

pyclasher/api/requests/LeagueSeason.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import PlayerRanking, PlayerRankingList, Season
+from ..models import PlayerRanking, PlayerRankingList, Season
 
 
 class LeagueSeasonRequest(IterRequestModel):

pyclasher/api/requests/Leagues.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import LeagueList, League
+from ..models import LeagueList, League
 
 
 class LeaguesRequest(IterRequestModel):

pyclasher/api/requests/Location.py

@@ -1,5 +1,5 @@
 from .RequestModels import RequestModel
-from api.models import Location
+from ..models import Location
 
 
 class LocationRequest(RequestModel, Location):

pyclasher/api/requests/Locations.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import Location, LocationList
+from ..models import Location, LocationList
 
 
 class LocationsRequest(IterRequestModel):

pyclasher/api/requests/Player.py

@@ -2,8 +2,9 @@
 from urllib.parse import quote
 
 from .RequestModels import RequestModel
-from pyclasher import ClientIsNotRunning, RequestMethods, ApiCode
-from api.models import Player, VerifyTokenRequest, VerifyTokenResponse
+from ..models import Player, VerifyTokenRequest, VerifyTokenResponse
+from ...client import RequestMethods
+from ...exceptions import ClientIsNotRunning, ApiCode
 
 
 class PlayerRequest(RequestModel, Player):

pyclasher/api/requests/PlayerBuilderBaseRankings.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import PlayerBuilderBaseRanking, PlayerBuilderBaseRankingList
+from ..models import PlayerBuilderBaseRanking, PlayerBuilderBaseRankingList
 
 
 class PlayerBuilderBaseRankingsRequest(IterRequestModel):

pyclasher/api/requests/PlayerLabels.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import LabelList, Label
+from ..models import LabelList, Label
 
 
 class PlayerLabelsRequest(IterRequestModel):

pyclasher/api/requests/PlayerRankings.py

@@ -1,5 +1,5 @@
 from .RequestModels import IterRequestModel
-from api.models import PlayerRanking, PlayerRankingList
+from ..models import PlayerRanking, PlayerRankingList
 
 
 class PlayerRankingsRequest(IterRequestModel):

pyclasher/api/requests/RequestModels.py

@@ -2,9 +2,9 @@
 from typing import Any
 from urllib.parse import quote, urlencode
 
-from Exceptions import NoClient, ClientIsNotRunning, RequestNotDone, MISSING
-from client import PyClasherClient, RequestMethods
-from api.models import Paging
+from ..models import Paging
+from ...client import PyClasherClient, RequestMethods
+from ...exceptions import NoClient, ClientIsNotRunning, RequestNotDone, MISSING
 
 request_id = 0