passes tests!

rowers/management/commands/processemail.py

@@ -14,7 +14,7 @@ import io
 
 from django.core.management.base import BaseCommand
 from django_mailbox.models import Message, MessageAttachment,Mailbox
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 
 from django.utils import timezone

rowers/tests/test_uploads.py

@@ -59,8 +59,6 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
 
-        f.close()
-
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
 
@@ -69,6 +67,7 @@ class ViewTest(TestCase):
         response = self.c.get('/rowers/workout/'+encoded1+'/', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
 
+
         response = self.c.get('/rowers/workout/'+encoded1+'/edit/', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
         
@@ -77,6 +76,7 @@ class ViewTest(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
+        f.close()
 
 
         response = self.c.get('/rowers/workout/'+encoded1+'/workflow/',
@@ -157,7 +157,6 @@ class ViewTest(TestCase):
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
 
-        f.close()
  
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
@@ -167,6 +166,7 @@ class ViewTest(TestCase):
         response = self.c.get('/rowers/workout/'+encoded1+'/', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
         
+        f.close()
        
         w = Workout.objects.get(id=1)
         f_to_be_deleted = w.csvfilename

rowers/uploads.py

@@ -349,7 +349,7 @@ def upload_options(body):
     uploadoptions = {}
     body = cleanbody(body)
     try:
-        yml = (yaml.load(body))
+        yml = (yaml.safe_load(body))
         if yml and 'fromuploadform' in yml:
             return yml
         try:

rowers/views/errorviews.py

@@ -7,29 +7,29 @@ from rowers.views.statements import *
 
 # Custom error pages with Rowsandall headers
 def error500_view(request):
-    response = render('500.html', {},
+    response = render(request,'500.html', {},)
-				  context_instance = RequestContext(request))
+#				  context_instance = RequestContext(request))
 
     response.status_code = 500
     return response
 
 def error404_view(request):
-    response = render('404.html', {},
+    response = render(request,'404.html', {},)
-				  context_instance = RequestContext(request))
+#				  context_instance = RequestContext(request))
 
     response.status_code = 404
     return response
 
 def error400_view(request):
-    response = render('400.html', {},
+    response = render(request,'400.html', {},)
-				  context_instance = RequestContext(request))
+#				  context_instance = RequestContext(request))
 
     response.status_code = 400
     return response
 
-def error403_view(request):
+def error403_view(request,*args, **kwargs):
-    response = render('403.html', {},
+    response = render(request,'403.html', {},)
-				  context_instance = RequestContext(request))
+#				  context_instance = RequestContext(request))
 
     response.status_code = 403
     return response