From 5fae4ea2fdcc46f31117b7d64dd1b477e7b8ffe3 Mon Sep 17 00:00:00 2001 From: Gonzalo Matheu Date: Wed, 14 Apr 2021 17:52:47 -0300 Subject: [PATCH] telegram: Formatting code --- freqtrade/rpc/telegram.py | 12 ++++++++---- tests/rpc/test_rpc_telegram.py | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index b24638e48..52cd7a5ed 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -12,7 +12,10 @@ from typing import Any, Callable, Dict, List, Union import arrow from tabulate import tabulate -from telegram import KeyboardButton, ParseMode, ReplyKeyboardMarkup, Update, BotCommand, InlineKeyboardMarkup, InlineKeyboardButton +from telegram import ( + KeyboardButton, ParseMode, ReplyKeyboardMarkup, + Update, InlineKeyboardMarkup, InlineKeyboardButton + ) from telegram.error import NetworkError, TelegramError from telegram.ext import CallbackContext, CommandHandler, Updater, CallbackQueryHandler from telegram.utils.helpers import escape_markdown @@ -615,7 +618,7 @@ class Telegram(RPCHandler): except RPCException as e: self._send_msg(str(e)) - def _forcebuy_action(self, pair, price = None): + def _forcebuy_action(self, pair, price=None): try: self._rpc._rpc_forcebuy(pair, price) except RPCException as e: @@ -969,7 +972,7 @@ class Telegram(RPCHandler): def _send_inline_msg(self, msg: str, callback_query_handler, parse_mode: str = ParseMode.MARKDOWN, disable_notification: bool = False, - keyboard: List[List[InlineKeyboardButton]] = None, ) -> None: + keyboard: List[List[InlineKeyboardButton]] = None, ) -> None: """ Send given markdown message :param msg: message @@ -982,7 +985,8 @@ class Telegram(RPCHandler): self._current_callback_query_handler = self._callback_query_handlers[callback_query_handler] self._updater.dispatcher.add_handler(self._current_callback_query_handler) - self._send_msg(msg, parse_mode, disable_notification, keyboard, reply_markup=InlineKeyboardMarkup) + self._send_msg(msg, parse_mode, disable_notification, keyboard, + reply_markup=InlineKeyboardMarkup) def _send_msg(self, msg: str, parse_mode: str = ParseMode.MARKDOWN, disable_notification: bool = False, diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index 7fdbf77f7..c80709ac1 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -54,6 +54,7 @@ class DummyCls(Telegram): """ raise Exception('test') + def get_telegram_testobject_with_inline(mocker, default_conf, mock=True, ftbot=None): inline_msg_mock = MagicMock() telegram, ftbot, msg_mock = get_telegram_testobject(mocker, default_conf) @@ -61,6 +62,7 @@ def get_telegram_testobject_with_inline(mocker, default_conf, mock=True, ftbot=N return telegram, ftbot, msg_mock, inline_msg_mock + def get_telegram_testobject(mocker, default_conf, mock=True, ftbot=None): msg_mock = MagicMock() if mock: @@ -914,7 +916,8 @@ def test_forcebuy_no_pair(default_conf, update, mocker) -> None: fbuy_mock = MagicMock(return_value=None) mocker.patch('freqtrade.rpc.RPC._rpc_forcebuy', fbuy_mock) - telegram, freqtradebot, _, inline_msg_mock = get_telegram_testobject_with_inline(mocker, default_conf) + telegram, freqtradebot, _, inline_msg_mock = get_telegram_testobject_with_inline(mocker, + default_conf) patch_get_signal(freqtradebot, (True, False)) context = MagicMock()