passes checks in python3
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
# All the data preparation, data cleaning and data mangling should
|
||||
# be defined here
|
||||
from __future__ import unicode_literals, absolute_import
|
||||
from rowers.models import Workout, StrokeData,Team
|
||||
|
||||
import pytz
|
||||
@@ -55,7 +56,7 @@ import pandas as pd
|
||||
import numpy as np
|
||||
import itertools
|
||||
import math
|
||||
from tasks import (
|
||||
from rowers.tasks import (
|
||||
handle_sendemail_unrecognized, handle_sendemail_breakthrough,
|
||||
handle_sendemail_hard, handle_updatecp,handle_updateergcp,
|
||||
handle_calctrimp,
|
||||
@@ -65,9 +66,9 @@ from django.conf import settings
|
||||
from sqlalchemy import create_engine
|
||||
import sqlalchemy as sa
|
||||
import sys
|
||||
import utils
|
||||
import datautils
|
||||
from utils import lbstoN,myqueue,is_ranking_piece,wavg
|
||||
import rowers.utils as utils
|
||||
import rowers.datautils as datautils
|
||||
from rowers.utils import lbstoN,myqueue,is_ranking_piece,wavg
|
||||
|
||||
from timezonefinder import TimezoneFinder
|
||||
|
||||
@@ -638,7 +639,7 @@ def deletecpdata_sql(rower_id,table='cpdata'):
|
||||
try:
|
||||
result = conn.execute(query)
|
||||
except:
|
||||
print "Database locked"
|
||||
print("Database locked")
|
||||
conn.close()
|
||||
engine.dispose()
|
||||
|
||||
@@ -855,7 +856,7 @@ def create_row_df(r,distance,duration,startdatetime,workouttype='rower',
|
||||
|
||||
return (id, message)
|
||||
|
||||
from utils import totaltime_sec_to_string
|
||||
from rowers.utils import totaltime_sec_to_string
|
||||
|
||||
# Processes painsled CSV file to database
|
||||
def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
|
||||
@@ -1564,7 +1565,7 @@ def compare_data(id):
|
||||
res = conn.execute(query)
|
||||
l2 = res.fetchall()[0][0]
|
||||
except:
|
||||
print "Database Locked"
|
||||
print("Database Locked")
|
||||
conn.close()
|
||||
engine.dispose()
|
||||
lfile = l1
|
||||
@@ -1583,13 +1584,13 @@ def repair_data(verbose=False):
|
||||
test, ldb, lfile = compare_data(w.id)
|
||||
if not test:
|
||||
if verbose:
|
||||
print w.id, lfile, ldb
|
||||
print(w.id, lfile, ldb)
|
||||
try:
|
||||
rowdata = rdata(w.csvfilename)
|
||||
if rowdata and len(rowdata.df):
|
||||
update_strokedata(w.id, rowdata.df)
|
||||
|
||||
except IOError, AttributeError:
|
||||
except (IOError, AttributeError):
|
||||
pass
|
||||
|
||||
if lfile == 0:
|
||||
@@ -1618,10 +1619,10 @@ def repair_data(verbose=False):
|
||||
def rdata(file, rower=rrower()):
|
||||
try:
|
||||
res = rrdata(csvfile=file, rower=rower)
|
||||
except IOError, IndexError:
|
||||
except (IOError, IndexError):
|
||||
try:
|
||||
res = rrdata(csvfile=file + '.gz', rower=rower)
|
||||
except IOError, IndexError:
|
||||
except (IOError, IndexError):
|
||||
res = rrdata()
|
||||
except:
|
||||
res = rrdata()
|
||||
@@ -1640,7 +1641,7 @@ def delete_strokedata(id):
|
||||
try:
|
||||
result = conn.execute(query)
|
||||
except:
|
||||
print "Database Locked"
|
||||
print("Database Locked")
|
||||
conn.close()
|
||||
engine.dispose()
|
||||
|
||||
@@ -1792,7 +1793,7 @@ def prepmultipledata(ids, verbose=False):
|
||||
for id in res:
|
||||
rowdata, row = getrowdata(id=id)
|
||||
if verbose:
|
||||
print id
|
||||
print(id)
|
||||
if rowdata and len(rowdata.df):
|
||||
data = dataprep(rowdata.df, id=id, bands=True,
|
||||
barchart=True, otwpower=True)
|
||||
@@ -2029,7 +2030,7 @@ def fix_newtons(id=0, limit=3000):
|
||||
peakforce = rowdata['peakforce']
|
||||
if peakforce.mean() > limit:
|
||||
w = Workout.objects.get(id=id)
|
||||
print "fixing ", id
|
||||
print("fixing ", id)
|
||||
rowdata = rdata(w.csvfilename)
|
||||
if rowdata and len(rowdata.df):
|
||||
update_strokedata(w.id, rowdata.df)
|
||||
|
||||
Reference in New Issue
Block a user