Merge branch 'develop' into feature/testcoverage
This commit is contained in:
@@ -204,7 +204,7 @@ class Command(BaseCommand):
|
|||||||
# Concept2
|
# Concept2
|
||||||
rowers = Rower.objects.filter(c2_auto_import=True)
|
rowers = Rower.objects.filter(c2_auto_import=True)
|
||||||
for r in rowers:
|
for r in rowers:
|
||||||
if user_is_not_basic(rower.user):
|
if user_is_not_basic(r.user):
|
||||||
c2stuff.get_c2_workouts(r)
|
c2stuff.get_c2_workouts(r)
|
||||||
|
|
||||||
|
|
||||||
@@ -246,7 +246,10 @@ class Command(BaseCommand):
|
|||||||
except IOError:
|
except IOError:
|
||||||
rowers = []
|
rowers = []
|
||||||
except Message.DoesNotExist:
|
except Message.DoesNotExist:
|
||||||
attachment.delete()
|
try:
|
||||||
|
attachment.delete()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
for rower in rowers:
|
for rower in rowers:
|
||||||
if 'zip' in extension:
|
if 'zip' in extension:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import gzip
|
|||||||
import base64
|
import base64
|
||||||
import yaml
|
import yaml
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
from requests import ConnectionError
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
from django.shortcuts import render_to_response
|
from django.shortcuts import render_to_response
|
||||||
|
|||||||
Reference in New Issue
Block a user