dev #19

Merged
profitroll merged 98 commits from dev into master 2023-04-24 13:48:22 +03:00
5 changed files with 15 additions and 29 deletions
Showing only changes of commit 0073120bf2 - Show all commits

View File

@ -1,26 +1,20 @@
"""This is only a temporary solution. Complete Photos API client is yet to be developed.""" """This is only a temporary solution. Complete Photos API client is yet to be developed."""
try:
from ujson import dumps
except ModuleNotFoundError:
from json import dumps
import asyncio import asyncio
from base64 import b64decode, b64encode from base64 import b64decode, b64encode
from traceback import print_exc
import aiofiles
from ujson import dumps
from os import makedirs, path, sep from os import makedirs, path, sep
from random import choice from random import choice
from traceback import print_exc
from typing import Tuple, Union from typing import Tuple, Union
import aiofiles
from aiohttp import ClientSession, FormData from aiohttp import ClientSession, FormData
from ujson import dumps
from classes.exceptions import SubmissionUploadError from classes.exceptions import SubmissionUploadError
from modules.logger import logWrite from modules.logger import logWrite
from modules.utils import configGet from modules.utils import configGet
http_session = ClientSession( http_session = ClientSession(
json_serialize=dumps, json_serialize=dumps,
) )

View File

@ -1,13 +1,9 @@
try: from datetime import datetime
from ujson import loads
except ModuleNotFoundError:
from json import loads
from os import stat, makedirs, path, getcwd
from gzip import open as gzipopen from gzip import open as gzipopen
from os import getcwd, makedirs, path, stat
from shutil import copyfileobj from shutil import copyfileobj
from datetime import datetime from ujson import loads
with open(getcwd() + path.sep + "config.json", "r", encoding="utf8") as file: with open(getcwd() + path.sep + "config.json", "r", encoding="utf8") as file:
json_contents = loads(file.read()) json_contents = loads(file.read())

View File

@ -1,16 +1,12 @@
try: from os import kill
from ujson import JSONDecodeError as JSONDecodeError
from ujson import loads, dumps
except ModuleNotFoundError:
from json import JSONDecodeError as JSONDecodeError
from json import loads, dumps
from sys import exit
from os import sep, kill
from os import name as osname from os import name as osname
from os import sep
from sys import exit
from traceback import print_exc from traceback import print_exc
from typing import Any from typing import Any
from ujson import JSONDecodeError, dumps, loads
from modules.logger import logWrite from modules.logger import logWrite

View File

@ -1,2 +1 @@
ujson~=5.7.0
tgcrypto~=1.2.5 tgcrypto~=1.2.5

View File

@ -1,8 +1,9 @@
apscheduler~=3.10.1 apscheduler~=3.10.1
pyrogram~=2.0.101 pyrogram~=2.0.101
aiohttp~=3.8.4 pytimeparse~=1.1.8
aiofiles~=23.1.0 aiofiles~=23.1.0
aiohttp~=3.8.4
psutil~=5.9.4 psutil~=5.9.4
pymongo~=4.3.3 pymongo~=4.3.3
pillow~=9.4.0 pillow~=9.4.0
pytimeparse~=1.1.8 ujson~=5.7.0