Maybe make import.py work on Python 3.6

This commit is contained in:
Tulir Asokan 2020-09-06 14:05:01 +03:00
parent 5e3fc57b62
commit c106c99b7f
1 changed files with 15 additions and 14 deletions

View File

@ -3,7 +3,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
from typing import Dict, TypedDict, Optional from typing import Dict, Optional, TYPE_CHECKING
from io import BytesIO from io import BytesIO
import argparse import argparse
import os.path import os.path
@ -70,19 +70,20 @@ async def upload(data: bytes, mimetype: str, filename: str) -> str:
return (await resp.json())["content_uri"] return (await resp.json())["content_uri"]
class MatrixMediaInfo(TypedDict): if TYPE_CHECKING:
w: int class MatrixMediaInfo(TypedDict):
h: int w: int
size: int h: int
mimetype: str size: int
thumbnail_url: Optional[str] mimetype: str
thumbnail_info: Optional['MatrixMediaInfo'] thumbnail_url: Optional[str]
thumbnail_info: Optional['MatrixMediaInfo']
class MatrixStickerInfo(TypedDict, total=False): class MatrixStickerInfo(TypedDict, total=False):
body: str body: str
url: str url: str
info: MatrixMediaInfo info: MatrixMediaInfo
def convert_image(data: bytes) -> (bytes, int, int): def convert_image(data: bytes) -> (bytes, int, int):
@ -93,7 +94,7 @@ def convert_image(data: bytes) -> (bytes, int, int):
return new_file.getvalue(), w, h return new_file.getvalue(), w, h
async def reupload_document(client: TelegramClient, document: Document) -> MatrixStickerInfo: async def reupload_document(client: TelegramClient, document: Document) -> 'MatrixStickerInfo':
print(f"Reuploading {document.id}", end="", flush=True) print(f"Reuploading {document.id}", end="", flush=True)
data = await client.download_media(document, file=bytes) data = await client.download_media(document, file=bytes)
print(".", end="", flush=True) print(".", end="", flush=True)
@ -168,7 +169,7 @@ async def reupload_pack(client: TelegramClient, pack: StickerSetFull) -> None:
except FileNotFoundError: except FileNotFoundError:
pass pass
reuploaded_documents: Dict[int, MatrixStickerInfo] = {} reuploaded_documents: Dict[int, 'MatrixStickerInfo'] = {}
for document in pack.documents: for document in pack.documents:
try: try:
reuploaded_documents[document.id] = already_uploaded[document.id] reuploaded_documents[document.id] = already_uploaded[document.id]