From 75b2db4424dc40e1c9dccfb582479a08bf1aa964 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 21 Aug 2019 06:58:56 +0200 Subject: [PATCH] FIx loading pairs-list --- freqtrade/configuration/configuration.py | 16 +++++++++------- freqtrade/misc.py | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/freqtrade/configuration/configuration.py b/freqtrade/configuration/configuration.py index 329058cef..b3f54d59e 100644 --- a/freqtrade/configuration/configuration.py +++ b/freqtrade/configuration/configuration.py @@ -346,10 +346,9 @@ class Configuration(object): # or if pairs file is specified explicitely if not pairs_file.exists(): raise OperationalException(f'No pairs file found with path "{pairs_file}".') - - config['pairs'] = json_load(pairs_file) - - config['pairs'].sort() + with pairs_file.open('r') as f: + config['pairs'] = json_load(f) + config['pairs'].sort() return if "config" in self.args and self.args.config: @@ -357,7 +356,10 @@ class Configuration(object): config['pairs'] = config.get('exchange', {}).get('pair_whitelist') else: # Fall back to /dl_path/pairs.json - pairs_file = Path(config['datadir']) / "pairs.json" + pairs_file = Path(config['datadir']) / config['exchange']['name'].lower() / "pairs.json" + print(config['datadir']) if pairs_file.exists(): - config['pairs'] = json_load(pairs_file) - config['pairs'].sort() + with pairs_file.open('r') as f: + config['pairs'] = json_load(f) + if 'pairs' in config: + config['pairs'].sort() diff --git a/freqtrade/misc.py b/freqtrade/misc.py index d01d6a254..12a90a14d 100644 --- a/freqtrade/misc.py +++ b/freqtrade/misc.py @@ -6,6 +6,7 @@ import logging import re from datetime import datetime from pathlib import Path +from typing.io import IO import numpy as np import rapidjson @@ -60,7 +61,7 @@ def file_dump_json(filename: Path, data, is_zip=False) -> None: logger.debug(f'done json to "{filename}"') -def json_load(datafile): +def json_load(datafile: IO): """ load data with rapidjson Use this to have a consistent experience,