From 453f62cdfa1883a7b6bb160882789497da6678e3 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 12 Dec 2018 19:57:40 +0100 Subject: [PATCH] Adjust imports --- freqtrade/freqtradebot.py | 6 +++--- freqtrade/strategy/interface.py | 2 +- freqtrade/tests/conftest.py | 2 +- freqtrade/tests/strategy/test_default_strategy.py | 2 +- freqtrade/tests/test_misc.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index e4f6311d5..14a48df3e 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -14,15 +14,15 @@ from requests.exceptions import RequestException from freqtrade import (DependencyException, OperationalException, TemporaryError, __version__, constants, persistence) -from freqtrade.exchange import Exchange -from freqtrade.wallets import Wallets +from freqtrade.data.convert import order_book_to_dataframe from freqtrade.edge import Edge +from freqtrade.exchange import Exchange from freqtrade.persistence import Trade from freqtrade.rpc import RPCManager, RPCMessageType from freqtrade.resolvers import StrategyResolver, PairListResolver from freqtrade.state import State from freqtrade.strategy.interface import SellType, IStrategy -from freqtrade.exchange.exchange_helpers import order_book_to_dataframe +from freqtrade.wallets import Wallets logger = logging.getLogger(__name__) diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 094831511..6182cac46 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -13,7 +13,7 @@ import arrow from pandas import DataFrame from freqtrade import constants -from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe +from freqtrade.data.convert import parse_ticker_dataframe from freqtrade.persistence import Trade logger = logging.getLogger(__name__) diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index 59c8835b5..85a9dabf4 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -11,7 +11,7 @@ import pytest from telegram import Chat, Message, Update from freqtrade import constants -from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe +from freqtrade.data.convert import parse_ticker_dataframe from freqtrade.exchange import Exchange from freqtrade.edge import Edge, PairInfo from freqtrade.freqtradebot import FreqtradeBot diff --git a/freqtrade/tests/strategy/test_default_strategy.py b/freqtrade/tests/strategy/test_default_strategy.py index 6acfc439f..ac574fcbc 100644 --- a/freqtrade/tests/strategy/test_default_strategy.py +++ b/freqtrade/tests/strategy/test_default_strategy.py @@ -3,7 +3,7 @@ import json import pytest from pandas import DataFrame -from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe +from freqtrade.data.convert import parse_ticker_dataframe from freqtrade.strategy.default_strategy import DefaultStrategy diff --git a/freqtrade/tests/test_misc.py b/freqtrade/tests/test_misc.py index e405457a1..a3408576f 100644 --- a/freqtrade/tests/test_misc.py +++ b/freqtrade/tests/test_misc.py @@ -3,7 +3,7 @@ import datetime from unittest.mock import MagicMock -from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe +from freqtrade.data.convert import parse_ticker_dataframe from freqtrade.misc import (common_datearray, datesarray_to_datetimearray, file_dump_json, format_ms_time, shorten_date) from freqtrade.optimize.__init__ import load_tickerdata_file