passing all tests on py3

rowers/views/importviews.py

@@ -5,6 +5,12 @@ from __future__ import unicode_literals
 
 from rowers.views.statements import *
 
+import numpy
+
+def default(o):
+    if isinstance(o, numpy.int64): return int(o)  
+    raise TypeError
+
 
 # Send workout to TP
 @login_required()
@@ -228,7 +234,7 @@ def workout_runkeeper_upload_view(request,id=0):
                    'Content-Length':'nnn'}
 
         url = "https://api.runkeeper.com/fitnessActivities"
-        response = requests.post(url,headers=headers,data=json.dumps(data))
+        response = requests.post(url,headers=headers,data=json.dumps(data,default=default))
 
         # check for duplicate error first
         if (response.status_code == 409 ):
@@ -293,7 +299,7 @@ def workout_underarmour_upload_view(request,id=0):
                    }
 
         url = "https://api.ua.com/v7.1/workout/"
-        response = requests.post(url,headers=headers,data=json.dumps(data))
+        response = requests.post(url,headers=headers,data=json.dumps(data,default=default))
 
         
         # check for duplicate error first
@@ -356,7 +362,7 @@ def workout_sporttracks_upload_view(request,id=0):
                    'Content-Type': 'application/json'}
 
         url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json"
-        response = requests.post(url,headers=headers,data=json.dumps(data))
+        response = requests.post(url,headers=headers,data=json.dumps(data,default=default))
 
         
         # check for duplicate error first

rowers/views/statements.py

@@ -28,6 +28,9 @@ import isodate
 import re
 import cgi
 from icalendar import Calendar, Event
+
+from functools import reduce
+
 import rowers.braintreestuff as braintreestuff
 import rowers.payments as payments
 from rowers.opaque import encoder
@@ -502,7 +505,7 @@ def remove_asynctask(request,id):
 def get_job_result(jobid):
     if settings.TESTING:
         return None
-    elif settings.DEBUG:
+    elif settings.CELERY:
         result = celery_result.AsyncResult(jobid).result
     else:
         running_job_ids = rq_registry.get_job_ids()
@@ -541,7 +544,7 @@ def get_job_status(jobid):
             'started_at':None,
             }
         return summary
-    elif settings.DEBUG:
+    elif settings.CELERY:
         job = celery_result.AsyncResult(jobid)
         jobresult = job.result
 
@@ -592,7 +595,7 @@ def get_job_status(jobid):
     return summary
 
 def kill_async_job(request,id='aap'):
-    if settings.DEBUG:
+    if settings.CELERY:
         job = celery_result.AsyncResult(id)
         job.revoke()
     else:
@@ -734,7 +737,7 @@ def get_stored_tasks_status(request):
         if finished:
             cache.set(id,100)
             progress = 100
-        elif cached_progress>0:
+        elif cached_progress is not None and cached_progress>0:
             progress = cached_progress
         else:
             progress = 0

rowers/views/workoutviews.py

@@ -4595,7 +4595,7 @@ def workout_split_view(request,id=0):
                 pass
                 
             qdict = {'q':rowname}
-            url+='?'+urllib.urlencode(qdict)
+            url+='?'+urllib.parse.urlencode(qdict)
 
             return HttpResponseRedirect(url)