Remove exception-handlers which catch exceptions that are never raised
This commit is contained in:
parent
8da79d0ab2
commit
857f4ec125
@ -1163,27 +1163,20 @@ class Telegram(RPCHandler):
|
|||||||
Handler for /blacklist
|
Handler for /blacklist
|
||||||
Shows the currently active blacklist
|
Shows the currently active blacklist
|
||||||
"""
|
"""
|
||||||
try:
|
self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args))
|
||||||
|
|
||||||
self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args))
|
|
||||||
except RPCException as e:
|
|
||||||
self._send_msg(str(e))
|
|
||||||
|
|
||||||
def send_blacklist_msg(self, blacklist: Dict):
|
def send_blacklist_msg(self, blacklist: Dict):
|
||||||
try:
|
errmsgs = []
|
||||||
errmsgs = []
|
for pair, error in blacklist['errors'].items():
|
||||||
for pair, error in blacklist['errors'].items():
|
errmsgs.append(f"Error adding `{pair}` to blacklist: `{error['error_msg']}`")
|
||||||
errmsgs.append(f"Error adding `{pair}` to blacklist: `{error['error_msg']}`")
|
if errmsgs:
|
||||||
if errmsgs:
|
self._send_msg('\n'.join(errmsgs))
|
||||||
self._send_msg('\n'.join(errmsgs))
|
|
||||||
|
|
||||||
message = f"Blacklist contains {blacklist['length']} pairs\n"
|
message = f"Blacklist contains {blacklist['length']} pairs\n"
|
||||||
message += f"`{', '.join(blacklist['blacklist'])}`"
|
message += f"`{', '.join(blacklist['blacklist'])}`"
|
||||||
|
|
||||||
logger.debug(message)
|
logger.debug(message)
|
||||||
self._send_msg(message)
|
self._send_msg(message)
|
||||||
except RPCException as e:
|
|
||||||
self._send_msg(str(e))
|
|
||||||
|
|
||||||
@authorized_only
|
@authorized_only
|
||||||
def _blacklist_delete(self, update: Update, context: CallbackContext) -> None:
|
def _blacklist_delete(self, update: Update, context: CallbackContext) -> None:
|
||||||
@ -1191,10 +1184,7 @@ class Telegram(RPCHandler):
|
|||||||
Handler for /bl_delete
|
Handler for /bl_delete
|
||||||
Deletes pair(s) from current blacklist
|
Deletes pair(s) from current blacklist
|
||||||
"""
|
"""
|
||||||
try:
|
self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args))
|
||||||
self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args))
|
|
||||||
except RPCException as e:
|
|
||||||
self._send_msg(str(e))
|
|
||||||
|
|
||||||
@authorized_only
|
@authorized_only
|
||||||
def _logs(self, update: Update, context: CallbackContext) -> None:
|
def _logs(self, update: Update, context: CallbackContext) -> None:
|
||||||
|
Loading…
Reference in New Issue
Block a user