Merge branch 'develop' into list-pairs2

2019-10-20 23:22:45 +03:00
parent 45b2d24b79 a52366c45d
commit 1bc63288a3
53 changed files with 1153 additions and 370 deletions
--- a/freqtrade/misc.py
+++ b/freqtrade/misc.py
@@ -72,8 +72,10 @@ def json_load(datafile: IO):

 def file_load_json(file):

-    gzipfile = file.with_suffix(file.suffix + '.gz')
-
+    if file.suffix != ".gz":
+        gzipfile = file.with_suffix(file.suffix + '.gz')
+    else:
+        gzipfile = file
    # Try gzip file first, otherwise regular json file.
    if gzipfile.is_file():
        logger.debug('Loading ticker data from file %s', gzipfile)