From 5ab72ac082213bf7a981e7bb8265049e6a67ea19 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 3 Mar 2022 07:07:33 +0100 Subject: [PATCH] chore: realign enums imports --- freqtrade/configuration/configuration.py | 3 +-- freqtrade/rpc/api_server/api_schemas.py | 3 +-- freqtrade/rpc/rpc.py | 4 +--- freqtrade/rpc/telegram.py | 4 +--- freqtrade/strategy/interface.py | 4 ++-- tests/rpc/test_rpc.py | 3 +-- tests/rpc/test_rpc_apiserver.py | 3 +-- tests/rpc/test_rpc_telegram.py | 3 +-- 8 files changed, 9 insertions(+), 18 deletions(-) diff --git a/freqtrade/configuration/configuration.py b/freqtrade/configuration/configuration.py index ae647ba4f..c780afca1 100644 --- a/freqtrade/configuration/configuration.py +++ b/freqtrade/configuration/configuration.py @@ -13,8 +13,7 @@ from freqtrade.configuration.deprecated_settings import process_temporary_deprec from freqtrade.configuration.directory_operations import create_datadir, create_userdata_dir from freqtrade.configuration.environment_vars import enironment_vars_to_dict from freqtrade.configuration.load_config import load_config_file, load_file -from freqtrade.enums import NON_UTIL_MODES, TRADING_MODES, CandleType, RunMode -from freqtrade.enums.tradingmode import TradingMode +from freqtrade.enums import NON_UTIL_MODES, TRADING_MODES, CandleType, RunMode, TradingMode from freqtrade.exceptions import OperationalException from freqtrade.loggers import setup_logging from freqtrade.misc import deep_merge_dicts, parse_db_uri_for_logging diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index e80bf3eb8..54491c68e 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -4,8 +4,7 @@ from typing import Any, Dict, List, Optional, Union from pydantic import BaseModel from freqtrade.constants import DATETIME_PRINT_FORMAT -from freqtrade.enums import OrderTypeValues, SignalDirection -from freqtrade.enums.tradingmode import TradingMode +from freqtrade.enums import OrderTypeValues, SignalDirection, TradingMode class Ping(BaseModel): diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 98207bfea..0badfd458 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -18,9 +18,7 @@ from freqtrade import __version__ from freqtrade.configuration.timerange import TimeRange from freqtrade.constants import CANCEL_REASON, DATETIME_PRINT_FORMAT from freqtrade.data.history import load_data -from freqtrade.enums import SellType, State -from freqtrade.enums.signaltype import SignalDirection -from freqtrade.enums.tradingmode import TradingMode +from freqtrade.enums import SellType, SignalDirection, State, TradingMode from freqtrade.exceptions import ExchangeError, PricingError from freqtrade.exchange import timeframe_to_minutes, timeframe_to_msecs from freqtrade.loggers import bufferHandler diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index f11003d52..0a568e5d5 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -23,9 +23,7 @@ from telegram.utils.helpers import escape_markdown from freqtrade.__init__ import __version__ from freqtrade.constants import DUST_PER_COIN -from freqtrade.enums import RPCMessageType -from freqtrade.enums.signaltype import SignalDirection -from freqtrade.enums.tradingmode import TradingMode +from freqtrade.enums import RPCMessageType, SignalDirection, TradingMode from freqtrade.exceptions import OperationalException from freqtrade.misc import chunks, plural, round_coin_value from freqtrade.persistence import Trade diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 3a0a633b0..92ea3daba 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -13,8 +13,8 @@ from pandas import DataFrame from freqtrade.constants import ListPairsWithTimeframes from freqtrade.data.dataprovider import DataProvider -from freqtrade.enums import CandleType, SellType, SignalDirection, SignalTagType, SignalType -from freqtrade.enums.tradingmode import TradingMode +from freqtrade.enums import (CandleType, SellType, SignalDirection, SignalTagType, SignalType, + TradingMode) from freqtrade.exceptions import OperationalException, StrategyError from freqtrade.exchange import timeframe_to_minutes, timeframe_to_seconds from freqtrade.exchange.exchange import timeframe_to_next_date diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py index 9bb809aaa..ae2294522 100644 --- a/tests/rpc/test_rpc.py +++ b/tests/rpc/test_rpc.py @@ -8,8 +8,7 @@ import pytest from numpy import isnan from freqtrade.edge import PairInfo -from freqtrade.enums import State, TradingMode -from freqtrade.enums.signaltype import SignalDirection +from freqtrade.enums import SignalDirection, State, TradingMode from freqtrade.exceptions import ExchangeError, InvalidOrderException, TemporaryError from freqtrade.persistence import Trade from freqtrade.persistence.models import Order diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index fb7431da9..ca4f40d74 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -17,8 +17,7 @@ from numpy import isnan from requests.auth import _basic_auth_str from freqtrade.__init__ import __version__ -from freqtrade.enums import CandleType, RunMode, State -from freqtrade.enums.tradingmode import TradingMode +from freqtrade.enums import CandleType, RunMode, State, TradingMode from freqtrade.exceptions import DependencyException, ExchangeError, OperationalException from freqtrade.loggers import setup_logging, setup_logging_pre from freqtrade.persistence import PairLocks, Trade diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index ed0c940fe..c5c48bb6e 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -18,8 +18,7 @@ from telegram.error import BadRequest, NetworkError, TelegramError from freqtrade import __version__ from freqtrade.constants import CANCEL_REASON from freqtrade.edge import PairInfo -from freqtrade.enums import RPCMessageType, RunMode, SellType, State -from freqtrade.enums.signaltype import SignalDirection +from freqtrade.enums import RPCMessageType, RunMode, SellType, SignalDirection, State from freqtrade.exceptions import OperationalException from freqtrade.freqtradebot import FreqtradeBot from freqtrade.loggers import setup_logging