Merge branch 'develop' into asyncio

This commit is contained in:
Dan 2019-03-04 12:51:00 +01:00
commit ccf7271d8c
2 changed files with 3 additions and 2 deletions

View File

@ -91,3 +91,4 @@ IMAGE_PROCESS_FAILED The server failed to process your image
USERNAME_NOT_MODIFIED The username was not modified USERNAME_NOT_MODIFIED The username was not modified
CALL_ALREADY_ACCEPTED The call is already accepted CALL_ALREADY_ACCEPTED The call is already accepted
CALL_ALREADY_DECLINED The call is already declined CALL_ALREADY_DECLINED The call is already declined
PHOTO_EXT_INVALID The photo extension is invalid
1 id message
91 USERNAME_NOT_MODIFIED The username was not modified
92 CALL_ALREADY_ACCEPTED The call is already accepted
93 CALL_ALREADY_DECLINED The call is already declined
94 PHOTO_EXT_INVALID The photo extension is invalid

View File

@ -1178,7 +1178,7 @@ class Client(Methods, BaseClient):
try: try:
module = import_module(module_path) module = import_module(module_path)
except ModuleNotFoundError: except ImportError:
log.warning('[LOAD] Ignoring non-existent module "{}"'.format(module_path)) log.warning('[LOAD] Ignoring non-existent module "{}"'.format(module_path))
continue continue
@ -1214,7 +1214,7 @@ class Client(Methods, BaseClient):
try: try:
module = import_module(module_path) module = import_module(module_path)
except ModuleNotFoundError: except ImportError:
log.warning('[UNLOAD] Ignoring non-existent module "{}"'.format(module_path)) log.warning('[UNLOAD] Ignoring non-existent module "{}"'.format(module_path))
continue continue