sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'bugfix/bugfixes' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-14 10:32:37 +02:00
parent 9dfd9b28a4 4f94655ca2
commit 9966bec60b
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -1349,7 +1349,6 @@ def new_workout_from_file(r, f2,
# handle non-Painsled by converting it to painsled compatible CSV # handle non-Painsled by converting it to painsled compatible CSV
if (fileformat != 'csv'): if (fileformat != 'csv'):
try:
f2, summary, oarlength, inboard, fileformat = handle_nonpainsled( f2, summary, oarlength, inboard, fileformat = handle_nonpainsled(
f2, f2,
fileformat, fileformat,
@@ -1358,10 +1357,6 @@ def new_workout_from_file(r, f2,
if not f2: if not f2:
message = 'Something went wrong' message = 'Something went wrong'
return (0, message, '') return (0, message, '')
except Exception as e:
errorstring = str(sys.exc_info()[0])
message = 'Something went wrong: ' + e.message
return (0, message, '')
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat) dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
dosummary = dosummary or summary == '' dosummary = dosummary or summary == ''

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.