Even more migrations to mautrix-python

mautrix_telegram/util/__init__.py

@@ -1,7 +1,10 @@
+from asyncio import Future
+
 from .file_transfer import transfer_file_to_matrix, convert_image
 from .format_duration import format_duration
 from .signed_token import sign_token, verify_token
 from .recursive_dict import recursive_del, recursive_set, recursive_get
 
-def ignore_coro(coro):
+
+def ignore_coro(_: Future) -> None:
     pass

mautrix_telegram/util/file_transfer.py

@@ -27,7 +27,8 @@ from telethon.tl.types import (Document, InputFileLocation, InputDocumentFileLoc
                                InputPeerPhotoFileLocation)
 from telethon.errors import (AuthBytesInvalidError, AuthKeyInvalidError, LocationInvalidError,
                              SecurityError, FileIdInvalidError)
-from mautrix_appservice import IntentAPI
+
+from mautrix.appservice import IntentAPI
 
 from ..tgclient import MautrixTelegramClient
 from ..db import TelegramFile as DBTelegramFile

mautrix_telegram/util/recursive_dict.py

@@ -14,11 +14,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from typing import Dict, Any
-from ..config import DictWithRecursion
+
+from mautrix.util.config import RecursiveDict
 
 
 def recursive_set(data: Dict[str, Any], key: str, value: Any) -> bool:
-    key, next_key = DictWithRecursion._parse_key(key)
+    key, next_key = RecursiveDict.parse_key(key)
     if next_key is not None:
         if key not in data:
             data[key] = {}
@@ -31,7 +32,7 @@ def recursive_set(data: Dict[str, Any], key: str, value: Any) -> bool:
 
 
 def recursive_get(data: Dict[str, Any], key: str) -> Any:
-    key, next_key = DictWithRecursion._parse_key(key)
+    key, next_key = RecursiveDict.parse_key(key)
     if next_key is not None:
         next_data = data.get(key, None)
         if not next_data:
@@ -41,7 +42,7 @@ def recursive_get(data: Dict[str, Any], key: str) -> Any:
 
 
 def recursive_del(data: Dict[str, any], key: str) -> bool:
-    key, next_key = DictWithRecursion._parse_key(key)
+    key, next_key = RecursiveDict.parse_key(key)
     if next_key is not None:
         if key not in data:
             return False