diff --git a/calendar_connector/event_convertor.py b/calendar_connector/event_convertor.py index c375d47..4394826 100644 --- a/calendar_connector/event_convertor.py +++ b/calendar_connector/event_convertor.py @@ -12,7 +12,7 @@ from calendar_connector.event_utils.location import extract_event_location from calendar_connector.event_utils.summary import extract_event_summary from calendar_connector.normalize import normalize -from calendar_connector.types.event_type import EventType +from calendar_connector.requests_types.event_type import EventType def event_to_calendar_event( diff --git a/calendar_connector/event_utils/date.py b/calendar_connector/event_utils/date.py index d52e7a7..9653eb8 100644 --- a/calendar_connector/event_utils/date.py +++ b/calendar_connector/event_utils/date.py @@ -3,7 +3,7 @@ from icalendar import Event from calendar_connector.consts import TIMEZONE -from calendar_connector.types.event_type import EventType +from calendar_connector.requests_types.event_type import EventType def extract_event_dates(event_data: EventType, event: Event) -> None: diff --git a/calendar_connector/event_utils/description.py b/calendar_connector/event_utils/description.py index cae7e3d..fc1123c 100644 --- a/calendar_connector/event_utils/description.py +++ b/calendar_connector/event_utils/description.py @@ -11,7 +11,7 @@ from calendar_connector.datetime_utils import get_formated_current_time from calendar_connector.event_utils.score import extract_scores from calendar_connector.cryptography import generate_hash -from calendar_connector.types.event_type import EventType +from calendar_connector.requests_types.event_type import EventType @dataclasses.dataclass diff --git a/calendar_connector/event_utils/location.py b/calendar_connector/event_utils/location.py index e53af91..3d5b222 100644 --- a/calendar_connector/event_utils/location.py +++ b/calendar_connector/event_utils/location.py @@ -3,7 +3,7 @@ from icalendar import Event from calendar_connector.normalize import normalize -from calendar_connector.types.event_type import EventType +from calendar_connector.requests_types.event_type import EventType def extract_event_location(event_data: Optional[EventType], event: Event) -> None: diff --git a/calendar_connector/event_utils/score.py b/calendar_connector/event_utils/score.py index 5213297..9a91c57 100644 --- a/calendar_connector/event_utils/score.py +++ b/calendar_connector/event_utils/score.py @@ -1,6 +1,6 @@ from typing import Literal -from calendar_connector.types.event_type import EventType +from calendar_connector.requests_types.event_type import EventType def _extract_scores_for_opponent( diff --git a/calendar_connector/event_utils/summary.py b/calendar_connector/event_utils/summary.py index 86855db..2fa1298 100644 --- a/calendar_connector/event_utils/summary.py +++ b/calendar_connector/event_utils/summary.py @@ -3,7 +3,7 @@ from calendar_connector.consts import MY_PRESENCE from calendar_connector.custom_exceptions import AttributeNotFoundException from calendar_connector.normalize import normalize -from calendar_connector.types.event_type import EventType +from calendar_connector.requests_types.event_type import EventType def _status_to_ics_status(sp_status: str) -> str: diff --git a/calendar_connector/types/__init__.py b/calendar_connector/requests_types/__init__.py similarity index 100% rename from calendar_connector/types/__init__.py rename to calendar_connector/requests_types/__init__.py diff --git a/calendar_connector/types/event_type.py b/calendar_connector/requests_types/event_type.py similarity index 92% rename from calendar_connector/types/event_type.py rename to calendar_connector/requests_types/event_type.py index 17d2262..66c784a 100644 --- a/calendar_connector/types/event_type.py +++ b/calendar_connector/requests_types/event_type.py @@ -1,7 +1,7 @@ from typing import TypedDict, Any, Optional -from calendar_connector.types.season_type import SeasonType -from calendar_connector.types.shared_type import CountryType +from calendar_connector.requests_types.season_type import SeasonType +from calendar_connector.requests_types.shared_type import CountryType class LocationType(TypedDict): diff --git a/calendar_connector/types/me_type.py b/calendar_connector/requests_types/me_type.py similarity index 90% rename from calendar_connector/types/me_type.py rename to calendar_connector/requests_types/me_type.py index 272721a..4f21139 100644 --- a/calendar_connector/types/me_type.py +++ b/calendar_connector/requests_types/me_type.py @@ -1,6 +1,6 @@ from typing import TypedDict, Any, Optional -from calendar_connector.types.shared_type import AvatarType +from calendar_connector.requests_types.shared_type import AvatarType class LinkType(TypedDict): diff --git a/calendar_connector/types/request_type.py b/calendar_connector/requests_types/request_type.py similarity index 100% rename from calendar_connector/types/request_type.py rename to calendar_connector/requests_types/request_type.py diff --git a/calendar_connector/types/season_type.py b/calendar_connector/requests_types/season_type.py similarity index 100% rename from calendar_connector/types/season_type.py rename to calendar_connector/requests_types/season_type.py diff --git a/calendar_connector/types/shared_type.py b/calendar_connector/requests_types/shared_type.py similarity index 100% rename from calendar_connector/types/shared_type.py rename to calendar_connector/requests_types/shared_type.py diff --git a/calendar_connector/types/team_type.py b/calendar_connector/requests_types/team_type.py similarity index 98% rename from calendar_connector/types/team_type.py rename to calendar_connector/requests_types/team_type.py index be2617a..cde48eb 100644 --- a/calendar_connector/types/team_type.py +++ b/calendar_connector/requests_types/team_type.py @@ -1,6 +1,6 @@ from typing import TypedDict, Any, Optional -from calendar_connector.types.shared_type import ( +from calendar_connector.requests_types.shared_type import ( CountryType, LogoType, SiteType, diff --git a/calendar_connector/sporteasy_connector.py b/calendar_connector/sporteasy_connector.py index 0666628..e35d784 100644 --- a/calendar_connector/sporteasy_connector.py +++ b/calendar_connector/sporteasy_connector.py @@ -11,10 +11,10 @@ url_csrf, ) from calendar_connector.normalize import normalize -from calendar_connector.types.event_type import EventType -from calendar_connector.types.me_type import MeType -from calendar_connector.types.request_type import RequestType, CsrfType -from calendar_connector.types.team_type import TeamType +from calendar_connector.requests_types.event_type import EventType +from calendar_connector.requests_types.me_type import MeType +from calendar_connector.requests_types.request_type import RequestType, CsrfType +from calendar_connector.requests_types.team_type import TeamType team_namedtuple = collections.namedtuple("team_namedtuple", ["id", "name", "web_url"])