Merge pull request #3 from kakeruzoku/dev

fix import

Author: kakeruzoku

changelog.md

@@ -7,6 +7,9 @@
 
 # 0.x.x
 ## 0.0.x
+### 0.0.2
+- **[Fix]** Importを修正
+
 ### 0.0.1
 - **[Other]** 共有
 - **[Add]** クラスの追加

scapi/__init__.py

@@ -1,7 +1,7 @@
 # Created by kakeruzoku / https://github.com/kakeruzoku/scapi
 # Special Thanks: Timmccool / https://github.com/TimMcCool/scratchattach
 __version__ = "0.0.1"
-from others.common import (
+from .others.common import (
     create_ClientSession,
     Response,
     Requests,
@@ -12,44 +12,44 @@
     empty_project_json,
     BIG
 )
-from others.error import *
+from .others.error import *
 del TYPE_CHECKING
-from others.other_api import (
+from .others.other_api import (
     get_csrf_token_sync
 )
-from sites.base import (
+from .sites.base import (
     _BaseSiteAPI,
     get_object as _get_object,
     get_object_iterator as _get_object_iterator,
     get_comment_iterator as _get_comment_iterator,
     get_count as _get_count
 )
-from sites.comment import (
+from .sites.comment import (
     CommentData,
     Comment,
     UserComment
 )
-from sites.project import (
+from .sites.project import (
     Project,
     get_project,
     create_Partial_Project,
     explore_projects,
     search_projects
 )
-from sites.session import (
+from .sites.session import (
     SessionStatus,
     Session,
     session_login,
     login
 )
-from sites.studio import (
+from .sites.studio import (
     Studio,
     get_studio,
     create_Partial_Studio,
     explore_studios,
     search_studios
 )
-from sites.user import (
+from .sites.user import (
     User,
     get_user,
     create_Partial_User

scapi/others/common.py

@@ -1,7 +1,7 @@
 import datetime
 import aiohttp
 from multidict import CIMultiDictProxy, CIMultiDict
-from others import error as exceptions
+from . import error as exceptions
 import json
 
 

scapi/others/error.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from others.common import Response
-    from sites.base import _BaseSiteAPI
+    from .common import Response
+    from ..sites.base import _BaseSiteAPI
 
 """
 階層表記

scapi/sites/base.py

@@ -2,14 +2,14 @@
 from typing import TYPE_CHECKING, Any, AsyncGenerator, Literal
 import random
 
-import others.common as common
-from others import error as exception
+from ..others import common as common
+from ..others import error as exception
 
 if TYPE_CHECKING:
-    from sites.session import Session as Scratch_Session
-    from sites.comment import Comment
-    from sites.studio import Studio
-    from sites.project import Project
+    from .session import Session as Scratch_Session
+    from .comment import Comment
+    from .studio import Studio
+    from .project import Project
 
 class _BaseSiteAPI(ABC):
     raise_class = exception.ObjectNotFound
@@ -128,7 +128,7 @@ async def get_comment_iterator(
         max_limit=40,
         add_params:dict={},
     ) -> AsyncGenerator["Comment",None]:
-    from sites.comment import Comment
+    from .comment import Comment
     for i in range(offset,offset+limit,max_limit):
         l = await common.api_iterative(
             plece.ClientSession,url,

scapi/sites/comment.py

@@ -3,15 +3,15 @@
 from typing import AsyncGenerator, Literal, TypedDict, TYPE_CHECKING, overload
 import warnings
 
-import others.common as common
-import others.error as exception
-import sites.base as base
+from ..others import  common
+from ..others import error as exception
+from . import base
 
 if TYPE_CHECKING:
-    from sites.session import Session
-    from sites.user import User
-    from sites.studio import Studio
-    from sites.project import Project
+    from .session import Session
+    from .user import User
+    from .studio import Studio
+    from .project import Project
 
 class CommentData(TypedDict):
     place:"Project|Studio"
@@ -30,9 +30,9 @@ def __init__(
         scratch_session:"Session|None"=None,
         **entries
     ) -> None:
-        from sites.user import User
-        from sites.studio import Studio
-        from sites.project import Project
+        from .user import User
+        from .studio import Studio
+        from .project import Project
 
         self.place:Project|Studio = data.get("place")
         self.id:int = data.get("id")
@@ -76,7 +76,7 @@ def _is_me_raise(self) -> None:
             raise exception.NoPermission
 
     def _update_from_dict(self, data:dict) -> None:
-        from sites.user import User
+        from .user import User
         self.parent_id = data.get("parent_id",self.parent_id)
         self.commentee_id = data.get("commentee_id",self.commentee_id)
         self.content = data.get("content",self.content)

scapi/sites/project.py

@@ -3,15 +3,15 @@
 from typing import AsyncGenerator, TYPE_CHECKING
 
 
-import others.common as common
-import others.error as exception
-import sites.base as base
-from sites.comment import Comment
+from ..others import common
+from ..others import error as exception
+from . import base
+from .comment import Comment
 
 if TYPE_CHECKING:
-    from sites.session import Session
-    from sites.user import User
-    from sites.studio import Studio
+    from .session import Session
+    from .user import User
+    from .studio import Studio
 
 class Project(base._BaseSiteAPI):
     raise_class = exception.ObjectNotFound
@@ -51,7 +51,7 @@ def __init__(
         self.remix_root:int|None = None
 
     def _update_from_dict(self, data:dict) -> None:
-        from sites.user import User
+        from .user import User
         _author:dict = data.get("author",{})
         self.author = User(self.ClientSession,_author.get("username",None),self.Session)
         self.author._update_from_dict(_author)
@@ -137,7 +137,7 @@ async def download(self) -> dict:
     def studios(self, *, limit=40, offset=0) -> AsyncGenerator["Studio",None]:
         common.no_data_checker(self.author)
         common.no_data_checker(self.author.username)
-        from sites.studio import Studio
+        from .studio import Studio
         return base.get_object_iterator(
             self.ClientSession,f"https://api.scratch.mit.edu/users/{self.author.username}/projects/{self.id}/studios",
             None,Studio,self.Session,
@@ -187,7 +187,7 @@ def create_Partial_Project(project_id:int,author_name:"str|None"=None,*,ClientSe
     ClientSession = common.create_ClientSession(ClientSession)
     _project = Project(ClientSession,project_id)
     if author_name is not None:
-        from sites.user import create_Partial_User
+        from .user import create_Partial_User
         _project.author = create_Partial_User(author_name,ClientSession=ClientSession)
     return _project
 

scapi/sites/session.py

@@ -1,11 +1,12 @@
 import datetime
 import re
 import warnings
-import others.other_api as other_api
-import others.common as common
-import others.error as exception
-from sites import base
-from sites import user,project,studio
+
+from ..others import other_api
+from ..others import common
+from ..others import error as exception
+from . import base
+from . import user,project,studio
 
 
 class SessionStatus:

scapi/sites/studio.py

@@ -3,14 +3,14 @@
 from typing import AsyncGenerator, TYPE_CHECKING
 
 
-import others.common as common
-import others.error as exception
-import sites.base as base
-from sites.comment import Comment
+from ..others import common as common
+from ..others import error as exception
+from . import base
+from .comment import Comment
 
 if TYPE_CHECKING:
-    from sites.session import Session
-    from sites.user import User
+    from .session import Session
+    from .user import User
 
 class Studio(base._BaseSiteAPI):
     raise_class = exception.StudioNotFound

scapi/sites/user.py

@@ -2,15 +2,15 @@
 import random
 from typing import AsyncGenerator, TypedDict, TYPE_CHECKING
 
-from others import common
-import others.error as exception
-import sites.base as base
-import sites.project as project
-import sites.comment as comment
+from ..others import common
+from ..others import error as exception
+from . import base
+from . import project
+from . import comment
 import bs4
 
 if TYPE_CHECKING:
-    from sites.session import Session
+    from .session import Session
 
 
 class User(base._BaseSiteAPI):