resolve import paths to account for bultin shadowing

docs/api.rst

@@ -171,16 +171,14 @@ QueryTags
 .. autoclass:: QueryTags
     :members:
 
-Token
-~~~~~
-.. autoclass:: Permissions()
-    :members:
-
 User
 ~~~~
 .. autoclass:: User()
     :members:
 
+.. autoclass:: hondana.user.UserInfo()
+    :members:
+
 
 Utilities
 ---------

docs/types.rst

@@ -1,231 +1,231 @@
 Response Types and Payloads
 ===========================
-.. currentmodule:: hondana.types
+.. currentmodule:: hondana.types_
 
 
 Common
 ------
 
-.. autoclass:: hondana.types.common.LanguageCode
+.. autoclass:: hondana.types_.common.LanguageCode
     :members:
     :undoc-members:
 
-.. autoclass:: hondana.types.common.LocalizedString
+.. autoclass:: hondana.types_.common.LocalizedString
 
 
 Artist
 ------
-.. autoclass:: hondana.types.artist.ArtistResponse
+.. autoclass:: hondana.types_.artist.ArtistResponse
 
-.. autoclass:: hondana.types.artist.ArtistAttributesResponse
+.. autoclass:: hondana.types_.artist.ArtistAttributesResponse
 
-.. autoclass:: hondana.types.artist.GetSingleArtistResponse
+.. autoclass:: hondana.types_.artist.GetSingleArtistResponse
 
-.. autoclass:: hondana.types.artist.GetMultiArtistResponse
+.. autoclass:: hondana.types_.artist.GetMultiArtistResponse
 
 Auth
 ----
-.. autoclass:: hondana.types.auth.TokenResponse
+.. autoclass:: hondana.types_.auth.TokenResponse
 
-.. autoclass:: hondana.types.auth.CheckPayload
+.. autoclass:: hondana.types_.auth.CheckPayload
 
-.. autoclass:: hondana.types.auth.RefreshPayload
+.. autoclass:: hondana.types_.auth.RefreshPayload
 
-.. autoclass:: hondana.types.auth.LoginPayload
+.. autoclass:: hondana.types_.auth.LoginPayload
 
 
 Author
 ------
-.. autoclass:: hondana.types.author.AuthorResponse
+.. autoclass:: hondana.types_.author.AuthorResponse
 
-.. autoclass:: hondana.types.author.AuthorAttributesResponse
+.. autoclass:: hondana.types_.author.AuthorAttributesResponse
 
-.. autoclass:: hondana.types.author.GetSingleAuthorResponse
+.. autoclass:: hondana.types_.author.GetSingleAuthorResponse
 
-.. autoclass:: hondana.types.author.GetMultiAuthorResponse
+.. autoclass:: hondana.types_.author.GetMultiAuthorResponse
 
 Chapter
 -------
-.. autoclass:: hondana.types.chapter.ChapterResponse
+.. autoclass:: hondana.types_.chapter.ChapterResponse
 
-.. autoclass:: hondana.types.chapter.ChapterAttributesResponse
+.. autoclass:: hondana.types_.chapter.ChapterAttributesResponse
 
-.. autoclass:: hondana.types.chapter.GetSingleChapterResponse
+.. autoclass:: hondana.types_.chapter.GetSingleChapterResponse
 
-.. autoclass:: hondana.types.chapter.GetMultiChapterResponse
+.. autoclass:: hondana.types_.chapter.GetMultiChapterResponse
 
-.. autoclass:: hondana.types.chapter.GetAtHomeResponse
+.. autoclass:: hondana.types_.chapter.GetAtHomeResponse
 
-.. autoclass:: hondana.types.chapter.GetAtHomeChapterResponse
+.. autoclass:: hondana.types_.chapter.GetAtHomeChapterResponse
 
-.. autoclass:: hondana.types.chapter.ChapterReadResponse
+.. autoclass:: hondana.types_.chapter.ChapterReadResponse
 
-.. autoclass:: hondana.types.chapter.ChapterReadHistoryResponse
+.. autoclass:: hondana.types_.chapter.ChapterReadHistoryResponse
 
 
 Cover
 -----
-.. autoclass:: hondana.types.cover.CoverResponse
+.. autoclass:: hondana.types_.cover.CoverResponse
 
-.. autoclass:: hondana.types.cover.CoverAttributesResponse
+.. autoclass:: hondana.types_.cover.CoverAttributesResponse
 
-.. autoclass:: hondana.types.cover.GetSingleCoverResponse
+.. autoclass:: hondana.types_.cover.GetSingleCoverResponse
 
-.. autoclass:: hondana.types.cover.GetMultiCoverResponse
+.. autoclass:: hondana.types_.cover.GetMultiCoverResponse
 
 
 CustomList
 ----------
-.. autoclass:: hondana.types.custom_list.CustomListResponse
+.. autoclass:: hondana.types_.custom_list.CustomListResponse
 
-.. autoclass:: hondana.types.custom_list.CustomListAttributesResponse
+.. autoclass:: hondana.types_.custom_list.CustomListAttributesResponse
 
-.. autoclass:: hondana.types.custom_list.GetSingleCustomListResponse
+.. autoclass:: hondana.types_.custom_list.GetSingleCustomListResponse
 
-.. autoclass:: hondana.types.custom_list.GetMultiCustomListResponse
+.. autoclass:: hondana.types_.custom_list.GetMultiCustomListResponse
 
 Errors
 ------
-.. autoclass:: hondana.types.errors.ErrorType
+.. autoclass:: hondana.types_.errors.ErrorType
 
-.. autoclass:: hondana.types.errors.APIError
+.. autoclass:: hondana.types_.errors.APIError
 
 
 Legacy
 ------
-.. autoclass:: hondana.types.legacy.LegacyMappingType
+.. autoclass:: hondana.types_.legacy.LegacyMappingType
     :members:
     :undoc-members:
 
-.. autoclass:: hondana.types.legacy.LegacyMappingResponse
+.. autoclass:: hondana.types_.legacy.LegacyMappingResponse
 
-.. autoclass:: hondana.types.legacy.LegacyMappingAttributesResponse
+.. autoclass:: hondana.types_.legacy.LegacyMappingAttributesResponse
 
-.. autoclass:: hondana.types.legacy.GetLegacyMappingResponse
+.. autoclass:: hondana.types_.legacy.GetLegacyMappingResponse
 
 
 Manga
 -----
-.. autoclass:: hondana.types.manga.MangaLinks
+.. autoclass:: hondana.types_.manga.MangaLinks
 
-.. autoclass:: hondana.types.manga.MangaResponse
+.. autoclass:: hondana.types_.manga.MangaResponse
 
-.. autoclass:: hondana.types.manga.GetMangaResponse
+.. autoclass:: hondana.types_.manga.GetMangaResponse
 
-.. autoclass:: hondana.types.manga.MangaAttributesResponse
+.. autoclass:: hondana.types_.manga.MangaAttributesResponse
 
-.. autoclass:: hondana.types.manga.MangaRelationAttributesResponse
+.. autoclass:: hondana.types_.manga.MangaRelationAttributesResponse
 
-.. autoclass:: hondana.types.manga.MangaRelationCreateResponse
+.. autoclass:: hondana.types_.manga.MangaRelationCreateResponse
 
-.. autoclass:: hondana.types.manga.MangaSearchResponse
+.. autoclass:: hondana.types_.manga.MangaSearchResponse
 
-.. autoclass:: hondana.types.manga.MangaRelation
+.. autoclass:: hondana.types_.manga.MangaRelation
 
-.. autoclass:: hondana.types.manga.MangaRelationResponse
+.. autoclass:: hondana.types_.manga.MangaRelationResponse
 
-.. autoclass:: hondana.types.manga.VolumesAndChaptersResponse
+.. autoclass:: hondana.types_.manga.VolumesAndChaptersResponse
 
-.. autoclass:: hondana.types.manga.ChaptersResponse
+.. autoclass:: hondana.types_.manga.ChaptersResponse
 
-.. autoclass:: hondana.types.manga.GetMangaVolumesAndChaptersResponse
+.. autoclass:: hondana.types_.manga.GetMangaVolumesAndChaptersResponse
 
-.. autoclass:: hondana.types.manga.MangaReadMarkersResponse
+.. autoclass:: hondana.types_.manga.MangaReadMarkersResponse
 
-.. autoclass:: hondana.types.manga.MangaGroupedReadMarkersResponse
+.. autoclass:: hondana.types_.manga.MangaGroupedReadMarkersResponse
 
-.. autoclass:: hondana.types.manga.MangaSingleReadingStatusResponse
+.. autoclass:: hondana.types_.manga.MangaSingleReadingStatusResponse
 
-.. autoclass:: hondana.types.manga.MangaMultipleReadingStatusResponse
+.. autoclass:: hondana.types_.manga.MangaMultipleReadingStatusResponse
 
 
 Relationship
 ------------
-.. autoclass:: hondana.types.relationship.RelationshipResponse
+.. autoclass:: hondana.types_.relationship.RelationshipResponse
 
 
 Report
 ------
-.. autoclass:: hondana.types.report.ReportReasonResponse
+.. autoclass:: hondana.types_.report.ReportReasonResponse
 
-.. autoclass:: hondana.types.report.GetReportReasonAttributesResponse
+.. autoclass:: hondana.types_.report.GetReportReasonAttributesResponse
 
-.. autoclass:: hondana.types.report.GetReportReasonResponse
+.. autoclass:: hondana.types_.report.GetReportReasonResponse
 
 
 Scanlator Group
 ---------------
-.. autoclass:: hondana.types.scanlator_group.ScanlationGroupResponse
+.. autoclass:: hondana.types_.scanlator_group.ScanlationGroupResponse
 
-.. autoclass:: hondana.types.scanlator_group.ScanlationGroupAttributesResponse
+.. autoclass:: hondana.types_.scanlator_group.ScanlationGroupAttributesResponse
 
-.. autoclass:: hondana.types.scanlator_group.GetSingleScanlationGroupResponse
+.. autoclass:: hondana.types_.scanlator_group.GetSingleScanlationGroupResponse
 
-.. autoclass:: hondana.types.scanlator_group.GetMultiScanlationGroupResponse
+.. autoclass:: hondana.types_.scanlator_group.GetMultiScanlationGroupResponse
 
 Settings
 --------
-.. autoclass:: hondana.types.settings.Settings
+.. autoclass:: hondana.types_.settings.Settings
 
-.. autoclass:: hondana.types.settings.SettingsPayload
+.. autoclass:: hondana.types_.settings.SettingsPayload
 
 Statistics
 ----------
-.. autoclass:: hondana.types.statistics.StatisticsRatingResponse
+.. autoclass:: hondana.types_.statistics.StatisticsRatingResponse
 
-.. autoclass:: hondana.types.statistics.BatchStatisticsRatingResponse
+.. autoclass:: hondana.types_.statistics.BatchStatisticsRatingResponse
 
-.. autoclass:: hondana.types.statistics.StatisticsResponse
+.. autoclass:: hondana.types_.statistics.StatisticsResponse
 
-.. autoclass:: hondana.types.statistics.BatchStatisticsResponse
+.. autoclass:: hondana.types_.statistics.BatchStatisticsResponse
 
-.. autoclass:: hondana.types.statistics.GetStatisticsResponse
+.. autoclass:: hondana.types_.statistics.GetStatisticsResponse
 
-.. autoclass:: hondana.types.statistics.BatchGetStatisticsResponse
+.. autoclass:: hondana.types_.statistics.BatchGetStatisticsResponse
 
-.. autoclass:: hondana.types.statistics.PersonalMangaRatingsResponse
+.. autoclass:: hondana.types_.statistics.PersonalMangaRatingsResponse
 
-.. autoclass:: hondana.types.statistics.GetPersonalMangaRatingsResponse
+.. autoclass:: hondana.types_.statistics.GetPersonalMangaRatingsResponse
 
 
 Tags
 ----
-.. autoclass:: hondana.types.tags.TagResponse
+.. autoclass:: hondana.types_.tags.TagResponse
 
-.. autoclass:: hondana.types.tags.TagAttributesResponse
+.. autoclass:: hondana.types_.tags.TagAttributesResponse
 
-.. autoclass:: hondana.types.tags.GetTagListResponse
+.. autoclass:: hondana.types_.tags.GetTagListResponse
 
 
 Token
 -----
-.. autoclass:: hondana.types.token.TokenPayload
+.. autoclass:: hondana.types_.token.TokenPayload
 
 
 User
 ----
-.. autoclass:: hondana.types.user.UserResponse
+.. autoclass:: hondana.types_.user.UserResponse
 
-.. autoclass:: hondana.types.user.GetUserAttributesResponse
+.. autoclass:: hondana.types_.user.GetUserAttributesResponse
 
-.. autoclass:: hondana.types.user.GetSingleUserResponse
+.. autoclass:: hondana.types_.user.GetSingleUserResponse
 
-.. autoclass:: hondana.types.user.GetMultiUserResponse
+.. autoclass:: hondana.types_.user.GetMultiUserResponse
 
 Upload
 ------
-.. autoclass:: hondana.types.upload.UploadSessionAttributes
+.. autoclass:: hondana.types_.upload.UploadSessionAttributes
 
-.. autoclass:: hondana.types.upload.GetUploadSessionResponse
+.. autoclass:: hondana.types_.upload.GetUploadSessionResponse
 
-.. autoclass:: hondana.types.upload.ChapterUploadAttributes
+.. autoclass:: hondana.types_.upload.ChapterUploadAttributes
 
-.. autoclass:: hondana.types.upload.ChapterUploadData
+.. autoclass:: hondana.types_.upload.ChapterUploadData
 
-.. autoclass:: hondana.types.upload.BeginChapterUploadResponse
+.. autoclass:: hondana.types_.upload.BeginChapterUploadResponse
 
-.. autoclass:: hondana.types.upload.UploadedChapterPageAttributes
+.. autoclass:: hondana.types_.upload.UploadedChapterPageAttributes
 
-.. autoclass:: hondana.types.upload.UploadedChapterDataResponse
+.. autoclass:: hondana.types_.upload.UploadedChapterDataResponse
 
-.. autoclass:: hondana.types.upload.UploadedChapterResponse
+.. autoclass:: hondana.types_.upload.UploadedChapterResponse

examples/create_manga.py

@@ -7,7 +7,7 @@
 
 
 if TYPE_CHECKING:
-    from hondana.types.common import LocalizedString
+    from hondana.types_.common import LocalizedString
 
 # Create your client, auth is needed for this.
 client = hondana.Client(username="my username", password="my password")

hondana/__init__.py

@@ -32,7 +32,7 @@
 from typing import Literal, NamedTuple
 
 from . import query as query
-from . import types as types
+from . import types_ as types_
 from . import utils as utils
 from .artist import *
 from .author import *
@@ -49,7 +49,6 @@
 from .report import *
 from .scanlator_group import *
 from .tags import *
-from .token import *
 from .user import *
 from .utils import MANGA_TAGS as MANGA_TAGS
 from .utils import MANGADEX_URL_REGEX as MANGADEX_URL_REGEX

hondana/artist.py

@@ -34,10 +34,10 @@
     from .author import Author
     from .http import HTTPClient
     from .manga import Manga
-    from .types.artist import ArtistAttributesResponse, ArtistResponse
-    from .types.common import LanguageCode, LocalizedString
-    from .types.manga import MangaResponse
-    from .types.relationship import RelationshipResponse
+    from .types_.artist import ArtistAttributesResponse, ArtistResponse
+    from .types_.common import LanguageCode, LocalizedString
+    from .types_.manga import MangaResponse
+    from .types_.relationship import RelationshipResponse
 
 
 __all__ = ("Artist",)

hondana/author.py

@@ -34,10 +34,10 @@
     from .artist import Artist
     from .http import HTTPClient
     from .manga import Manga
-    from .types.author import AuthorAttributesResponse, AuthorResponse
-    from .types.common import LanguageCode, LocalizedString
-    from .types.manga import MangaResponse
-    from .types.relationship import RelationshipResponse
+    from .types_.author import AuthorAttributesResponse, AuthorResponse
+    from .types_.common import LanguageCode, LocalizedString
+    from .types_.manga import MangaResponse
+    from .types_.relationship import RelationshipResponse
 
 __all__ = ("Author",)