mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-31 14:25:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into plugins

Browse Source 
# Conflicts:
#	pyrogram/client/client.py
#	pyrogram/client/ext/base_client.py
This commit is contained in:
Dan
2018-10-13 10:39:47 +02:00
parent 6a0066b8b5 a32009a79d
commit 340fb9c145
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pyrogram/client/client.py
View File

@@ -162,8 +162,8 @@ class Client(Methods, BaseClient):
first_name: str = None, first_name: str = None,
last_name: str = None, last_name: str = None,
workers: int = 4, workers: int = 4,
workdir: str = ".", workdir: str = BaseClient.WORKDIR,
config_file: str = "./config.ini", config_file: str = BaseClient.CONFIG_FILE,
plugins_dir: str = BaseClient.PLUGINS_DIR): plugins_dir: str = BaseClient.PLUGINS_DIR):
super().__init__() super().__init__()

2
pyrogram/client/ext/base_client.py
View File

@@ -49,6 +49,8 @@ class BaseClient:
UPDATES_WORKERS = 1 UPDATES_WORKERS = 1
DOWNLOAD_WORKERS = 1 DOWNLOAD_WORKERS = 1
OFFLINE_SLEEP = 300 OFFLINE_SLEEP = 300
WORKDIR = "."
CONFIG_FILE = "./config.ini"
PLUGINS_DIR = "./plugins" PLUGINS_DIR = "./plugins"
MEDIA_TYPE_ID = { MEDIA_TYPE_ID = {