diff --git a/freqtrade/commands/data_commands.py b/freqtrade/commands/data_commands.py index b183d403b..2279cdc39 100644 --- a/freqtrade/commands/data_commands.py +++ b/freqtrade/commands/data_commands.py @@ -107,7 +107,7 @@ def start_list_data(args: Dict[str, Any]) -> None: from tabulate import tabulate - from freqtrade.data.history.idatahandler import get_datahandler + from freqtrade.data.history import get_datahandler dhc = get_datahandler(config['datadir'], config['dataformat_ohlcv']) paircombs = dhc.ohlcv_get_available_data( diff --git a/freqtrade/data/converter/converter.py b/freqtrade/data/converter/converter.py index 0db947e35..0ebf24a4f 100644 --- a/freqtrade/data/converter/converter.py +++ b/freqtrade/data/converter/converter.py @@ -200,7 +200,7 @@ def convert_ohlcv_format( :param convert_to: Target format :param erase: Erase source data (does not apply if source and target format are identical) """ - from freqtrade.data.history.idatahandler import get_datahandler + from freqtrade.data.history import get_datahandler src = get_datahandler(config['datadir'], convert_from) trg = get_datahandler(config['datadir'], convert_to) timeframes = config.get('timeframes', [config.get('timeframe')]) diff --git a/freqtrade/data/converter/trade_converter.py b/freqtrade/data/converter/trade_converter.py index 682430994..a7cc97cb8 100644 --- a/freqtrade/data/converter/trade_converter.py +++ b/freqtrade/data/converter/trade_converter.py @@ -96,7 +96,7 @@ def convert_trades_to_ohlcv( """ Convert stored trades data to ohlcv data """ - from freqtrade.data.history.idatahandler import get_datahandler + from freqtrade.data.history import get_datahandler data_handler_trades = get_datahandler(datadir, data_format=data_format_trades) data_handler_ohlcv = get_datahandler(datadir, data_format=data_format_ohlcv) @@ -135,7 +135,7 @@ def convert_trades_format(config: Config, convert_from: str, convert_to: str, er import_kraken_trades_from_csv(config, convert_to) return - from freqtrade.data.history.idatahandler import get_datahandler + from freqtrade.data.history import get_datahandler src = get_datahandler(config['datadir'], convert_from) trg = get_datahandler(config['datadir'], convert_to) diff --git a/freqtrade/data/converter/trade_converter_kraken.py b/freqtrade/data/converter/trade_converter_kraken.py index 80bd917af..90f7df28f 100644 --- a/freqtrade/data/converter/trade_converter_kraken.py +++ b/freqtrade/data/converter/trade_converter_kraken.py @@ -6,7 +6,7 @@ import pandas as pd from freqtrade.constants import DATETIME_PRINT_FORMAT, DEFAULT_TRADES_COLUMNS, Config from freqtrade.data.converter.trade_converter import (trades_convert_types, trades_df_remove_duplicates) -from freqtrade.data.history.idatahandler import get_datahandler +from freqtrade.data.history import get_datahandler from freqtrade.enums import TradingMode from freqtrade.exceptions import OperationalException from freqtrade.plugins.pairlist.pairlist_helpers import expand_pairlist diff --git a/freqtrade/util/migrations/binance_mig.py b/freqtrade/util/migrations/binance_mig.py index cc9c451b2..b15e20100 100644 --- a/freqtrade/util/migrations/binance_mig.py +++ b/freqtrade/util/migrations/binance_mig.py @@ -63,7 +63,7 @@ def migrate_binance_futures_data(config: Config): # only act on new futures return - from freqtrade.data.history.idatahandler import get_datahandler + from freqtrade.data.history import get_datahandler dhc = get_datahandler(config['datadir'], config['dataformat_ohlcv']) paircombs = dhc.ohlcv_get_available_data( diff --git a/freqtrade/util/migrations/funding_rate_mig.py b/freqtrade/util/migrations/funding_rate_mig.py index 9fe433b2d..85b66ce3f 100644 --- a/freqtrade/util/migrations/funding_rate_mig.py +++ b/freqtrade/util/migrations/funding_rate_mig.py @@ -2,7 +2,7 @@ import logging from typing import Optional from freqtrade.constants import Config -from freqtrade.data.history.idatahandler import get_datahandler +from freqtrade.data.history import get_datahandler from freqtrade.enums import TradingMode from freqtrade.exchange import Exchange diff --git a/tests/data/test_history.py b/tests/data/test_history.py index a3fe492b7..0e1846d55 100644 --- a/tests/data/test_history.py +++ b/tests/data/test_history.py @@ -15,13 +15,13 @@ from pandas.testing import assert_frame_equal from freqtrade.configuration import TimeRange from freqtrade.constants import DATETIME_PRINT_FORMAT from freqtrade.data.converter import ohlcv_to_dataframe +from freqtrade.data.history import get_datahandler from freqtrade.data.history.history_utils import (_download_pair_history, _download_trades_history, _load_cached_data_for_updating, get_timerange, load_data, load_pair_history, refresh_backtest_ohlcv_data, refresh_backtest_trades_data, refresh_data, validate_backtest_data) -from freqtrade.data.history.idatahandler import get_datahandler from freqtrade.data.history.jsondatahandler import JsonDataHandler, JsonGzDataHandler from freqtrade.enums import CandleType, TradingMode from freqtrade.exchange import timeframe_to_minutes diff --git a/tests/data/test_trade_converter_kraken.py b/tests/data/test_trade_converter_kraken.py index ba9221e0a..cc5721030 100644 --- a/tests/data/test_trade_converter_kraken.py +++ b/tests/data/test_trade_converter_kraken.py @@ -5,7 +5,7 @@ from unittest.mock import PropertyMock import pytest from freqtrade.data.converter.trade_converter_kraken import import_kraken_trades_from_csv -from freqtrade.data.history.idatahandler import get_datahandler +from freqtrade.data.history import get_datahandler from freqtrade.enums import TradingMode from freqtrade.exceptions import OperationalException from tests.conftest import EXMS, log_has, log_has_re, patch_exchange