From ca739f71fb17b0c0437745ab257f67afc3b9823a Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 Aug 2019 20:37:11 +0200 Subject: [PATCH] Fix default argument handling for timeframe_to_nextdate --- freqtrade/exchange/exchange.py | 2 +- freqtrade/tests/exchange/test_exchange.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index d0432a060..e36032c49 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -801,7 +801,7 @@ def timeframe_to_prev_date(timeframe: str, date: datetime = None) -> datetime: :returns: date of previous candle (with utc timezone) """ if not date: - date = datetime.utcnow() + date = datetime.now(timezone.utc) timeframe_secs = timeframe_to_seconds(timeframe) # Get offset based on timerame_secs offset = date.timestamp() % timeframe_secs diff --git a/freqtrade/tests/exchange/test_exchange.py b/freqtrade/tests/exchange/test_exchange.py index 23604f44f..3747a2ad3 100644 --- a/freqtrade/tests/exchange/test_exchange.py +++ b/freqtrade/tests/exchange/test_exchange.py @@ -1588,6 +1588,9 @@ def test_timeframe_to_prev_date(): for interval, result in tf_list: assert timeframe_to_prev_date(interval, date) == result + date = datetime.now(tz=timezone.utc) + assert timeframe_to_prev_date("5m", date) < date + def test_timeframe_to_next_date(): # 2019-08-12 13:22:08 @@ -1609,3 +1612,6 @@ def test_timeframe_to_next_date(): for interval, result in tf_list: assert timeframe_to_next_date(interval, date) == result + + date = datetime.now(tz=timezone.utc) + assert timeframe_to_next_date("5m", date) > date