working, passing tests in django 3.2

rowers/views/paymentviews.py

@@ -855,14 +855,14 @@ def rower_register_view(request):
             d = {
                 'user': theuser,
                 'domain': current_site.domain,
-                'uid': urlsafe_base64_encode(force_bytes(theuser.id)).decode(),
+                'uid': urlsafe_base64_encode(force_bytes(theuser.id)),
                 'token': account_activation_token.make_token(theuser),
             }
             to_email = form.cleaned_data.get('email')
             message = render_to_string('acc_activate_email.html', {
                 'user': theuser,
                 'domain': current_site.domain,
-                'uid': urlsafe_base64_encode(force_bytes(theuser.id)).decode(),
+                'uid': urlsafe_base64_encode(force_bytes(theuser.id)),
                 'token': account_activation_token.make_token(theuser),
             })
             to_email = form.cleaned_data.get('email')

rowers/views/planviews.py

@@ -1617,9 +1617,7 @@ def plannedsessions_print_view(request,userid=0,startdatestring='',enddatestring
 def plannedsessions_manage_view(request,userid=0,
                                 initialsession=0):
 
-    is_ajax = False
-    if request.is_ajax(): # pragma: no cover
-        is_ajax = True
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     r = getrequestrower(request,userid=userid)
 

rowers/views/racesviews.py

@@ -414,9 +414,7 @@ def virtualevent_setlogo_view(request,id=0,logoid=0): # pragma: no cover
 # Image upload to virtual event
 @login_required()
 def virtualevent_uploadimage_view(request,id=0): # pragma: no cover
-    is_ajax = False
-    if request.is_ajax():
-        is_ajax = True
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     r = getrower(request.user)
 
@@ -519,9 +517,7 @@ def virtualevent_uploadimage_view(request,id=0): # pragma: no cover
 @login_required()
 @permission_required('course.change_course',fn=get_course_by_pk,raise_exception=True)
 def course_upload_replace_view(request,id=0):
-    is_ajax = False
-    if request.is_ajax(): # pragma: no cover
-        is_ajax = True
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     r = getrower(request.user)
 
@@ -649,9 +645,7 @@ def course_update_confirm(request,id=0,newid=0):
 # Course upload
 @login_required()
 def course_upload_view(request):
-    is_ajax = False
-    if request.is_ajax(): # pragma: no cover
-        is_ajax = True
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     r = getrower(request.user)
 
@@ -715,9 +709,7 @@ def course_upload_view(request):
 # Standards deactivate
 @login_required()
 def standard_deactivate_view(request,id=0):
-    is_ajax = False
-    if request.is_ajax(): # pragma: no cover
-        is_ajax = True
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     r = getrower(request.user)
 
@@ -762,10 +754,8 @@ def standards_download_view(request,id=0):
 # Standards upload
 @login_required()
 def standards_upload_view(request,id=0):
-    is_ajax = False
-    if request.is_ajax(): # pragma: no cover
-        is_ajax = True
-        r = getrower(request.user)
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
+    r = getrower(request.user)
 
     if id != 0: # pragma: no cover
         collection = StandardCollection.objects.get(id=id)
@@ -833,9 +823,7 @@ def standards_upload_view(request,id=0):
 
 
 def virtualevents_view(request):
-    is_ajax = False
-    if request.is_ajax(): # pragma: no cover
-        is_ajax = True
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     g = GeoIP2()
     ip = request.META.get('HTTP_X_REAL_IP','1.1.1.1')

rowers/views/workoutviews.py

@@ -4873,7 +4873,7 @@ def workout_map_view(request,id=0):
 # Image upload
 @permission_required('workout.change_workout',fn=get_workout_by_opaqueid,raise_exception=True)
 def workout_uploadimage_view(request,id): # pragma: no cover
-    is_ajax = request_is_ajax(request)
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
 
     r = getrower(request.user)
@@ -5013,7 +5013,7 @@ def workout_add_chart_view(request,id,plotnr=1):
 @login_required
 @permission_required('workout.change_workout',fn=get_workout_by_opaqueid,raise_exception=True)
 def workout_toggle_ranking(request,id=0):
-    is_ajax = request_is_ajax(request)
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
 
     row = get_workout_by_opaqueid(request,id)
@@ -5286,7 +5286,7 @@ def workout_upload_view(request,
                         },
                         raceid=0):
 
-    is_ajax = request_is_ajax(request)
+    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
     if settings.TESTING:
         is_ajax = False