Moved objects into their own place in a folder for readability

Github/http.py

@@ -9,7 +9,6 @@ import re
 
 from .exceptions import *
 from .objects import *
-from .objects import APIOBJECT
 from .urls import *
 
 LINK_PARSING_RE = re.compile(r"<(\S+(\S))>; rel=\"(\S+)\"")

Github/main.py

@@ -9,7 +9,7 @@ import aiohttp
 
 from . import http
 from .exceptions import AlreadyStarted, NotStarted
-from .objects import User
+from .objects import User, Repository
 
 class Github:
     _auth = None
@@ -61,7 +61,7 @@ class Github:
         """Fetch a Github user from their username."""
         return User(await http.get_user(self.session, username), self.session)
 
-    async def get_repo(self, repo_name: str) -> 'Repo':
+    async def get_repo(self, repo_name: str) -> Repository:
         """Fetch a Github repository from it's name."""
         pass
 

Github/objects/__init__.py

@@ -0,0 +1,5 @@
+#== __init__.py ==#
+
+from .objects import *
+from .user import *
+from .repo import *

Github/objects/objects.py

@@ -0,0 +1,29 @@
+#== objects.py ==#
+
+from datetime import datetime
+import aiohttp
+
+__all__ = (
+    'APIOBJECT',
+)
+
+def dt_formatter(time_str):
+    if time_str is not None:
+        return datetime.strptime(time_str, r"%Y-%m-%dT%H:%M:%SZ")
+    return None
+
+def repr_dt(time_str):
+    return time_str.strftime(r'%d-%m-%Y, %H:%M:%S')
+
+class APIOBJECT:
+    __slots__ = (
+        '_response',
+        'session'
+    )
+
+    def __init__(self, response: dict[str, str | int], session: aiohttp.ClientSession) -> None:
+        self._response = response
+        self.session = session
+
+    def __repr__(self) -> str:
+        return f'<{self.__class__.__name__}>'

Github/objects/repo.py

@@ -0,0 +1,49 @@
+#== repo.py ==#
+
+import aiohttp
+
+from .objects import APIOBJECT, dt_formatter
+from . import PartialUser
+from .. import http
+
+__all__ = (
+    'Repository',
+)
+
+class Repository(APIOBJECT):
+    __slots__ = (
+        'id',
+        'name',
+        'owner',
+        'size'
+        'created_at',
+        'url',
+        'html_url',
+        'archived',
+        'disabled',
+        'updated_at',
+        'open_issues_count',
+        'default_branch',
+        'clone_url',
+        'stargazers_count',
+        'watchers_count',
+        'forks',
+        'license'
+        )
+    def __init__(self, response: dict, session: aiohttp.ClientSession) -> None:
+        super().__init__(response, session)
+        tmp = self.__slots__ + APIOBJECT.__slots__
+        keys = {key: value for key,value in self.response.items() if key in tmp}
+        for key, value in key.items():
+            if key == 'owner':
+                self.owner = PartialUser(value, self.session)
+                return
+
+            if '_at' in key and value is not None:
+                setattr(self, key, dt_formatter(value))
+                return
+
+            setattr(self, key, value)
+
+    def __repr__(self) -> str:
+        return f'<Repository; id: {self.id}, name: {self.name}, owner: {self.owner}, created_at: {dt_formatter(self.created_at)}, default_branch: {self.default_branch}, license: {self.license}, >'

Github/objects/user.py

@@ -1,37 +1,15 @@
-#== objects.py ==#
+#== user.py ==#
-
-from datetime import datetime
 
 import aiohttp
 
-from . import http
+from .objects import APIOBJECT, dt_formatter
+from .. import http
 
 __all__ = (
-    'User'
+    'User',
+    'PartialUser'
 )
 
-def dt_formatter(time_str):
-    if time_str is not None:
-        return datetime.strptime(time_str, r"%Y-%m-%dT%H:%M:%SZ")
-    return None
-
-def repr_dt(time_str):
-    return time_str.strftime(r'%d-%m-%Y, %H:%M:%S')
-
-class APIOBJECT:
-    __slots__ = (
-        '_response',
-        'session'
-    )
-
-    def __init__(self, response: dict[str, str | int], session: aiohttp.ClientSession) -> None:
-        self._response = response
-        self.session = session
-
-
-    def __repr__(self) -> str:
-        return f'<{self.__class__.__name__}>'
-
 class _BaseUser(APIOBJECT):
     __slots__ = (
         'login',
@@ -72,7 +50,7 @@ class User(_BaseUser):
             setattr(self, key, value)
 
     def __repr__(self):
-        return f'<User; login: {self.login}, id: {self.id}, created_at: {repr_dt(self.created_at)}>'
+        return f'<User; login: {self.login}, id: {self.id}, created_at: {dt_formatter(self.created_at)}>'
 
     @classmethod
     async def get_user(cls, session: aiohttp.ClientSession, username: str) -> 'User':
@@ -95,49 +73,9 @@ class PartialUser(_BaseUser):
 
 
     def __repr__(self):
-        return f'<PartialUser; login: {self.login}, id: {self.id}, site_admin: {self.site_admin}, html_url: {self.html_url}, created_at: {repr_dt(self.created_at)}>'
+        return f'<PartialUser; login: {self.login}, id: {self.id}, site_admin: {self.site_admin}, html_url: {self.html_url}, created_at: {dt_formatter(self.created_at)}>'
 
     async def _get_user(self):
         """Upgrades the PartialUser to a User object.""" 
         response = await http.get_user(self.session, self.login)
         return User(response, self.session)
-
-
-class Repository(APIOBJECT):
-    __slots__ = (
-        'id',
-        'name',
-        'owner',
-        'size'
-        'created_at',
-        'url',
-        'html_url',
-        'archived',
-        'disabled',
-        'updated_at',
-        'open_issues_count',
-        'default_branch',
-        'clone_url',
-        'stargazers_count',
-        'watchers_count',
-        'forks',
-        'license'
-        )
-    def __init__(self, response: dict, session: aiohttp.ClientSession) -> None:
-        super().__init__(response, session)
-        tmp = self.__slots__
-        keys = {key: value for key,value in self.response.items() if key in tmp}
-        for key, value in key.items():
-            if key == 'owner':
-                self.owner = PartialUser(value, self.session)
-                return
-
-            if '_at' in key and value is not None:
-                setattr(self, key, dt_formatter(value))
-                return
-
-            setattr(self, key, value)
-
-    def __repr__(self) -> str:
-        return f'<Repository; id: {self.id}, name: {self.name}, owner: {self.owner}, created_at: {repr_dt(self.created_at)}, default_branch: {self.default_branch}, license: {self.license}, >'
-