diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py index 3825ff21..17584108 100644 --- a/rowers/braintreestuff.py +++ b/rowers/braintreestuff.py @@ -73,7 +73,7 @@ def process_webhook(notification): if notification.kind == 'subscription_charged_successfully': subscription = notification.subscription rs = Rower.objects.filter(subscription_id=subscription.id) - if rs.count() == 0: + if rs.count() == 0: # pragma: no cover dologging('braintreewebhooks.log','Could not find rowers with subscription ID {id}'.format( id=subscription.id )) @@ -209,7 +209,7 @@ def make_payment(rower,data): if 'plan' in data: theplan = data['plan'] additional_text = 'Rowsandall Purchase Plan nr {theplan}'.format(theplan=theplan) - else: + else: # pragma: no cover additional_text = 'Rowsandall Purchase' result = gateway.transaction.sale({ diff --git a/rowers/credits.py b/rowers/credits.py index e57710c9..3ddb6cfb 100644 --- a/rowers/credits.py +++ b/rowers/credits.py @@ -4,16 +4,16 @@ class InsufficientCreditError(Exception): pass def upgrade(amount, rower): - if rower.eurocredits > amount: + if rower.eurocredits > amount: # pragma: no cover return rower.eurocredits else: rower.eurocredits = amount rower.save() return rower.eurocredits - return rower.eurocredits + return rower.eurocredits # pragma: no cover def withdraw(amount, rower): - if rower.eurocredits < amount: + if rower.eurocredits < amount: # pragma: no cover rower.eurocredits = 0 rower.save() raise InsufficientCreditError @@ -22,9 +22,9 @@ def withdraw(amount, rower): rower.save() return rower.eurocredits - return rower.eurocredits + return rower.eurocredits # pragma: no cover -def discount(amount,rower): +def discount(amount,rower): # pragma: no cover if amount < rower.eurocredits: return amount else: @@ -33,9 +33,9 @@ def discount(amount,rower): return 0 def discounted(amount,rower): - if amount > rower.eurocredits: + if amount > rower.eurocredits: # pragma: no cover return amount-rower.eurocredits else: return 0 - return 0 + return 0 # pragma: no cover diff --git a/rowers/forms.py b/rowers/forms.py index ce63eb52..deee532d 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1486,7 +1486,7 @@ class RaceResultFilterForm(forms.Form): if records: # group - if groups: + if groups: # pragma: no cover thecategories = [record.entrycategory for record in records] thecategories = list(set(thecategories)) if len(thecategories) <= 1: diff --git a/rowers/models.py b/rowers/models.py index 7378789f..5db49f02 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -103,22 +103,22 @@ smoothingchoices = ( def half_year_from_now(ttz=None): if ttz is None: return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=182)).date() - return (datetime.datetime.utcnow()+timezone.timedelta(days=182)).astimezone(pytz.timezone(ttz)).date() + return (datetime.datetime.utcnow()+timezone.timedelta(days=182)).astimezone(pytz.timezone(ttz)).date() # pragma: no cover def a_week_from_now(ttz=None): if ttz is None: return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=7)).date() - return (datetime.datetime.utcnow()+timezone.timedelta(days=7)).astimezone(pytz.timezone(ttz)).date() + return (datetime.datetime.utcnow()+timezone.timedelta(days=7)).astimezone(pytz.timezone(ttz)).date() # pragma: no cover def current_day(ttz=None): if ttz is None: return (datetime.datetime.now(tz=timezone.utc)).date() - return datetime.datetime.utcnow().astimezone(pytz.timezone(ttz)).date() + return datetime.datetime.utcnow().astimezone(pytz.timezone(ttz)).date() # pragma: no cover def current_time(ttz=None): # pragma: no cover if ttz is None: return datetime.datetime.now(tz=timezone.utc) - return (datetime.datetime.utcnow()).astimezone(pytz.timezone(ttz)) + return (datetime.datetime.utcnow()).astimezone(pytz.timezone(ttz)) # pragma: no cover class UserFullnameChoiceField(forms.ModelChoiceField): @@ -2188,7 +2188,7 @@ class TrainingMesoCycle(models.Model): if not self.enddate <= self.startdate: super(TrainingMesoCycle,self).save(*args, **kwargs) - else: + else: # pragma: no cover self.enddate = self.startdate super(TrainingMesoCycle,self).save(*args, **kwargs) @@ -2512,18 +2512,18 @@ class PlannedSession(models.Model): elif self.sessiontype != 'coursetest' and self.sessiontype != 'race': self.course = None - if self.enddate < self.startdate: + if self.enddate < self.startdate: # pragma: no cover self.enddate = self.startdate - if self.preferreddate > self.enddate: + if self.preferreddate > self.enddate: # pragma: no cover self.preferreddate = self.enddate - if self.preferreddate < self.startdate: + if self.preferreddate < self.startdate: # pragma: no cover self.preferreddate = self.startdate #super(PlannedSession,self).save(*args, **kwargs) if self.steps: steps = self.steps - elif self.fitfile: + elif self.fitfile: # pragma: no cover steps = steps_read_fit(os.path.join(settings.MEDIA_ROOT,self.fitfile.name)) self.steps = steps diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index f133ce0b..a72bcc46 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -132,7 +132,7 @@ def buy_trainingplan_view(request,id=0): status = True # get target and set enddate - try: + try: # pragma: no cover targetid = cd['target'] target = TrainingTarget.objects.get(id=int(targetid)) except (KeyError,ValueError): @@ -192,7 +192,7 @@ def purchase_checkouts_view(request): }) return HttpResponseRedirect(url) - if r.rowerplan == 'freecoach': + if r.rowerplan == 'freecoach': # pragma: no cover messages.error(request,'You cannot purchase this training plan as a free coach member') url = reverse('rower_view_instantplan',kwargs={ 'id':plan.uuid, @@ -230,7 +230,7 @@ def purchase_checkouts_view(request): startdate = enddate-datetime.timedelta(days=plan.duration) # upgrade rower - if r.rowerplan == 'basic': + if r.rowerplan == 'basic': # pragma: no cover messages.info(request,'You have been upgraded to the Self-Coach plan for the duration of the plan') r.rowerplan = 'plan' r.planexpires = enddate @@ -280,7 +280,7 @@ def purchase_checkouts_view(request): messages.error(request,"There was an error in the payment form") url = reverse("purchase_checkouts_view") return HttpResponseRedirect(url) - else: + else: # pragma: no cover messages.error(request,"There was an error in the payment form") url = reverse('rower_select_instantplan') # pragma: no cover diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index 8cf39c7c..a7306d34 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -396,7 +396,7 @@ def rower_exportsettings_view(request,userid=0): def rower_edit_view(request,rowerid=0,userid=0,message=""): r = getrequestrowercoachee(request,rowerid=rowerid,userid=userid,notpermanent=True) - if 'courseshare' in request.GET: + if 'courseshare' in request.GET: # pragma: no cover courseshare = request.GET.get('courseshare',"ok") if courseshare == 'true': r.share_course_results = True