From b593205ad99570d73a578e1f7d348920b50fd52f Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 12 Jul 2023 18:27:46 +0200 Subject: [PATCH] No need to use .get() for properties with default values --- freqtrade/data/dataprovider.py | 2 +- freqtrade/edge/edge_positioning.py | 6 +++--- freqtrade/optimize/backtesting.py | 8 ++++---- freqtrade/plot/plotting.py | 2 +- freqtrade/rpc/rpc.py | 2 +- freqtrade/util/binance_mig.py | 2 +- tests/conftest.py | 1 + 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/freqtrade/data/dataprovider.py b/freqtrade/data/dataprovider.py index cea0b23ef..e7ba20c44 100644 --- a/freqtrade/data/dataprovider.py +++ b/freqtrade/data/dataprovider.py @@ -310,7 +310,7 @@ class DataProvider: timeframe=timeframe or self._config['timeframe'], datadir=self._config['datadir'], timerange=timerange, - data_format=self._config.get('dataformat_ohlcv', 'feather'), + data_format=self._config['dataformat_ohlcv'], candle_type=_candle_type, ) diff --git a/freqtrade/edge/edge_positioning.py b/freqtrade/edge/edge_positioning.py index 3e7fa2156..47623f107 100644 --- a/freqtrade/edge/edge_positioning.py +++ b/freqtrade/edge/edge_positioning.py @@ -115,7 +115,7 @@ class Edge: exchange=self.exchange, timeframe=self.strategy.timeframe, timerange=timerange_startup, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=self.config.get('candle_type_def', CandleType.SPOT), ) # Download informative pairs too @@ -132,7 +132,7 @@ class Edge: exchange=self.exchange, timeframe=timeframe, timerange=timerange_startup, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=self.config.get('candle_type_def', CandleType.SPOT), ) @@ -142,7 +142,7 @@ class Edge: timeframe=self.strategy.timeframe, timerange=self._timerange, startup_candles=self.strategy.startup_candle_count, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=self.config.get('candle_type_def', CandleType.SPOT), ) diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index 9d10eb328..a168b7eb6 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -239,7 +239,7 @@ class Backtesting: timerange=self.timerange, startup_candles=self.config['startup_candle_count'], fail_without_data=True, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=self.config.get('candle_type_def', CandleType.SPOT) ) @@ -268,7 +268,7 @@ class Backtesting: timerange=self.timerange, startup_candles=0, fail_without_data=True, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=self.config.get('candle_type_def', CandleType.SPOT) ) else: @@ -282,7 +282,7 @@ class Backtesting: timerange=self.timerange, startup_candles=0, fail_without_data=True, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=CandleType.FUNDING_RATE ) @@ -294,7 +294,7 @@ class Backtesting: timerange=self.timerange, startup_candles=0, fail_without_data=True, - data_format=self.config.get('dataformat_ohlcv', 'feather'), + data_format=self.config['dataformat_ohlcv'], candle_type=CandleType.from_string(self.exchange.get_option("mark_ohlcv_price")) ) # Combine data to avoid combining the data per trade. diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py index 8f939170e..5d16e74ba 100644 --- a/freqtrade/plot/plotting.py +++ b/freqtrade/plot/plotting.py @@ -55,7 +55,7 @@ def init_plotscript(config, markets: List, startup_candles: int = 0): timeframe=config['timeframe'], timerange=timerange, startup_candles=startup_candles, - data_format=config.get('dataformat_ohlcv', 'feather'), + data_format=config['dataformat_ohlcv'], candle_type=config.get('candle_type_def', CandleType.SPOT) ) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 46ea375cc..35af370e4 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -1245,7 +1245,7 @@ class RPC: pairs=[pair], timeframe=timeframe, timerange=timerange_parsed, - data_format=config.get('dataformat_ohlcv', 'feather'), + data_format=config['dataformat_ohlcv'], candle_type=config.get('candle_type_def', CandleType.SPOT) ) if pair not in _data: diff --git a/freqtrade/util/binance_mig.py b/freqtrade/util/binance_mig.py index 024c34dba..7043459f2 100644 --- a/freqtrade/util/binance_mig.py +++ b/freqtrade/util/binance_mig.py @@ -64,7 +64,7 @@ def migrate_binance_futures_data(config: Config): return from freqtrade.data.history.idatahandler import get_datahandler - dhc = get_datahandler(config['datadir'], config.get('dataformat_ohlcv', 'feather')) + dhc = get_datahandler(config['datadir'], config['dataformat_ohlcv']) paircombs = dhc.ohlcv_get_available_data( config['datadir'], diff --git a/tests/conftest.py b/tests/conftest.py index 66f331cae..6c4a271d6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -526,6 +526,7 @@ def get_default_conf(testdatadir): "disableparamexport": True, "internals": {}, "export": "none", + "dataformat_ohlcv": "feather", "candle_type_def": CandleType.SPOT, } return configuration