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

fixed obsolete usage of rowingdata(csvfile)

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-12 22:20:47 +01:00
parent 09ae7cbe77
commit af609dd7e0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprepnodjango.py
View File

@@ -140,10 +140,10 @@ def timedeltaconv(x):
def rdata(file,rower=rrower()):
try:
res = rrdata(file,rower=rower)
res = rrdata(csvfile=file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
res = rrdata(csvfile=file+'.gz',rower=rower)
except IOError:
res = 0
@@ -948,7 +948,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
f1 = workout.csvfilename
try:
rowdata = dataprep(rrdata(f1).df)
rowdata = dataprep(rrdata(csvfile=f1).df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
@@ -960,7 +960,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
df = pd.concat([df,rowdata],ignore_index=True)
except IOError:
try:
rowdata = dataprep(rrdata(f1+'.gz').df)
rowdata = dataprep(rrdata(csvfile=f1+'.gz').df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2],

8
rowers/mailprocessing.py
View File

@@ -64,18 +64,18 @@ def send_confirm(user, name, link, options):
def rdata(file, rower=rrower()):
""" Reads rowingdata data or returns 0 on Error """
try:
result = rrdata(file, rower=rower)
result = rrdata(csvfile=file, rower=rower)
except IOError:
try:
result = rrdata(file + '.gz', rower=rower)
result = rrdata(csvfile=file + '.gz', rower=rower)
except IOError:
result = 0
except TypeError:
try:
result = rrdata(file)
result = rrdata(csvfile=file)
except IOError:
try:
result = rrdata(file+'.gz', rower=rower)
result = rrdata(csvfile=file+'.gz', rower=rower)
except IOError:
result = 0