From 2bd9d962733b64b5e0b1256cf54dece0245ef075 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 22 Dec 2019 15:14:39 +0100 Subject: [PATCH] removed unnecessary else --- rowers/tasks.py | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index d39ca012..6e25ac0d 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1581,21 +1581,29 @@ def handle_otwsetpower(self,f1, boattype, weightvalue, grpc.channel_ready_future(channel).result(timeout=10) except grpc.FutureTimeoutError: return 0 - else: - stub = calculator_pb2_grpc.PowerStub(channel) - response = stub.CalcPower(calculator_pb2.WorkoutPowerRequest( - filename = csvfile, - boattype = boattype, - crewmass = weightvalue, - powermeasured = powermeasured, - progressurl = progressurl, - secret = secret, - silent = False, - ),timeout=1200) - result = response.result - if result == 0: - # send failure email - return 0 + + stub = calculator_pb2_grpc.PowerStub(channel) + response = stub.CalcPower(calculator_pb2.WorkoutPowerRequest( + filename = csvfile, + boattype = boattype, + crewmass = weightvalue, + powermeasured = powermeasured, + progressurl = progressurl, + secret = secret, + silent = False, + ),timeout=1200) + result = response.result + if result == 0: + # send failure email + return 0 + # do something with boat type + try: + rowdata = rdata(csvfile) + except IOError: + try: + rowdata = rdata(csvfile) + except IOError: + rowdata = rdata(csvfile) else: boatfile = {