adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into mypy_typecheck

Browse Source
This commit is contained in:
xmatthias
2018-06-03 10:35:56 +02:00
parent a8bf5092e8 ec7c11513e
commit 50fc5f91ca
15 changed files with 140 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
freqtrade/arguments.py
View File

@@ -223,6 +223,9 @@ class Arguments(object):
syntax = [(r'^-(\d{8})$', (None, 'date')),
(r'^(\d{8})-$', ('date', None)),
(r'^(\d{8})-(\d{8})$', ('date', 'date')),
(r'^-(\d{10})$', (None, 'date')),
(r'^(\d{10})-$', ('date', None)),
(r'^(\d{10})-(\d{10})$', ('date', 'date')),
(r'^(-\d+)$', (None, 'line')),
(r'^(\d+)-$', ('line', None)),
(r'^(\d+)-(\d+)$', ('index', 'index'))]
@@ -237,14 +240,16 @@ class Arguments(object):
if stype[0]:
starts = rvals[index]
if stype[0] == 'date':
start = arrow.get(starts, 'YYYYMMDD').timestamp
start = int(starts) if len(starts) == 10 \
else arrow.get(starts, 'YYYYMMDD').timestamp
else:
start = int(starts)
index += 1
if stype[1]:
stops = rvals[index]
if stype[1] == 'date':
stop = arrow.get(stops, 'YYYYMMDD').timestamp
stop = int(stops) if len(stops) == 10 \
else arrow.get(stops, 'YYYYMMDD').timestamp
else:
stop = int(stops)
return stype, start, stop