Fixed a bug in type hinting

Author: Taaku18

core/changelog.py

@@ -4,11 +4,9 @@
 from typing import List
 from collections import defaultdict
 
-from bot import ModmailBot
-
 
 class Version:
-    def __init__(self, bot: ModmailBot, version: str, lines: str):
+    def __init__(self, bot, version: str, lines: str):
         self.bot = bot 
         self.version = version
         self.lines = [x for x in lines.splitlines() if x]
@@ -52,7 +50,7 @@ class ChangeLog:
                      'kyb3r/modmail/master/CHANGELOG.md')
     regex = re.compile(r'# (v\d+\.\d+\.\d+)([\S\s]*?(?=# v|$))')
 
-    def __init__(self, bot: ModmailBot, text: str):
+    def __init__(self, bot, text: str):
         self.bot = bot
         self.text = text 
         self.versions = [Version(bot, *m) for m in self.regex.findall(text)]
@@ -66,7 +64,7 @@ def embeds(self) -> List[Embed]:
         return [v.embed for v in self.versions]
 
     @classmethod
-    async def from_repo(cls, bot: ModmailBot, url: str = ''):
+    async def from_repo(cls, bot, url: str = ''):
         url = url or cls.changelog_url
         resp = await bot.session.get(url)
         return cls(bot, await resp.text())

core/clients.py

@@ -8,11 +8,9 @@
 from json import JSONDecodeError
 from pymongo import ReturnDocument
 
-from bot import ModmailBot
-
 
 class ApiClient:
-    def __init__(self, bot: ModmailBot):
+    def __init__(self, bot):
         self.bot = bot
         self.session = bot.session
         self.headers: dict = None
@@ -45,7 +43,7 @@ class Github(ApiClient):
     FORK_URL = REPO + '/forks'
     STAR_URL = BASE + '/user/starred/kyb3r/modmail'
 
-    def __init__(self, bot: ModmailBot,
+    def __init__(self, bot,
                  access_token: str = None,
                  username: str = None):
         super().__init__(bot)
@@ -94,7 +92,7 @@ async def get_latest_commits(self, limit=3):
         ...
 
     @classmethod
-    async def login(cls, bot: ModmailBot) -> 'Github':
+    async def login(cls, bot) -> 'Github':
         self = cls(bot, bot.config.get('github_access_token'))
         resp: dict = await self.request('https://api.github.com/user')
         self.username: str = resp['login']
@@ -113,7 +111,7 @@ class ModmailApiClient(ApiClient):
     LOGS = BASE + '/logs'
     CONFIG = BASE + '/config'
 
-    def __init__(self, bot: ModmailBot):
+    def __init__(self, bot):
         super().__init__(bot)
         self.token: Optional[str] = bot.config.get('modmail_api_token')
         if self.token:
@@ -213,7 +211,7 @@ def post_log(self, channel_id: Union[int, str], payload: dict):
 
 class SelfHostedClient(ModmailApiClient):
 
-    def __init__(self, bot: ModmailBot):
+    def __init__(self, bot):
         super().__init__(bot)
         self.token: Optional[str] = bot.config.get('github_access_token')
         if self.token:

core/config.py

@@ -5,8 +5,6 @@
 
 import box
 
-from bot import ModmailBot
-
 
 class ConfigManager:
     """Class that manages a cached configuration"""
@@ -32,7 +30,7 @@ class ConfigManager:
 
     valid_keys = allowed_to_change_in_command | internal_keys | protected_keys
 
-    def __init__(self, bot: ModmailBot):
+    def __init__(self, bot):
         self.bot = bot
         self.cache = box.Box()
         self.ready_event = asyncio.Event()