Merge branch 'develop' into feature/testcoverage

rowers/management/commands/processemail.py

@@ -204,7 +204,7 @@ class Command(BaseCommand):
         # Concept2
         rowers = Rower.objects.filter(c2_auto_import=True)
         for r in rowers:
-            if user_is_not_basic(rower.user):
+            if user_is_not_basic(r.user):
                 c2stuff.get_c2_workouts(r)
 
 
@@ -246,7 +246,10 @@ class Command(BaseCommand):
             except IOError:
                 rowers = []
             except Message.DoesNotExist:
-                attachment.delete()
+                try:
+                    attachment.delete()
+                except:
+                    pass
             for rower in rowers:
                 if 'zip' in extension:
                     try:

rowers/polarstuff.py

@@ -24,6 +24,7 @@ import gzip
 import base64
 import yaml
 from uuid import uuid4
+from requests import ConnectionError
 
 # Django
 from django.shortcuts import render_to_response