Use str(error) instead of error.message (W1645)
Fixes exception-message-attribute (W1645) pylint error. Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>merge-requests/851/head
parent
6ed02d4dd9
commit
1719473d70
|
@ -14,4 +14,3 @@ disable=
|
||||||
W0703, # broad-except
|
W0703, # broad-except
|
||||||
# py3k transition issues:
|
# py3k transition issues:
|
||||||
W1633, # round-builtin
|
W1633, # round-builtin
|
||||||
W1645, # exception-message-attribute
|
|
||||||
|
|
|
@ -44,24 +44,13 @@ class ObservationView( # pylint: disable=R0901
|
||||||
else:
|
else:
|
||||||
data = serializer.errors
|
data = serializer.errors
|
||||||
response = Response(data, status=status.HTTP_400_BAD_REQUEST)
|
response = Response(data, status=status.HTTP_400_BAD_REQUEST)
|
||||||
except ValueError as error:
|
except (NegativeElevationError, SinglePassError, ValidationError, ValueError) as error:
|
||||||
data = error.message
|
response = Response(str(error), status=status.HTTP_400_BAD_REQUEST)
|
||||||
response = Response(data, status=status.HTTP_400_BAD_REQUEST)
|
|
||||||
except ValidationError as error:
|
|
||||||
data = error.message
|
|
||||||
response = Response(data, status=status.HTTP_400_BAD_REQUEST)
|
|
||||||
except LatestTle.DoesNotExist:
|
except LatestTle.DoesNotExist:
|
||||||
data = 'Scheduling failed: Satellite without TLE'
|
data = 'Scheduling failed: Satellite without TLE'
|
||||||
response = Response(data, status=status.HTTP_501_NOT_IMPLEMENTED)
|
response = Response(data, status=status.HTTP_501_NOT_IMPLEMENTED)
|
||||||
except ObservationOverlapError as error:
|
except ObservationOverlapError as error:
|
||||||
data = error.message
|
response = Response(str(error), status=status.HTTP_409_CONFLICT)
|
||||||
response = Response(data, status=status.HTTP_409_CONFLICT)
|
|
||||||
except NegativeElevationError as error:
|
|
||||||
data = error.message
|
|
||||||
response = Response(data, status=status.HTTP_400_BAD_REQUEST)
|
|
||||||
except SinglePassError as error:
|
|
||||||
data = error.message
|
|
||||||
response = Response(data, status=status.HTTP_400_BAD_REQUEST)
|
|
||||||
return response
|
return response
|
||||||
|
|
||||||
def update(self, request, *args, **kwargs):
|
def update(self, request, *args, **kwargs):
|
||||||
|
|
|
@ -287,9 +287,9 @@ def observation_new_post(request):
|
||||||
else:
|
else:
|
||||||
messages.success(request, str(total) + ' Observations were scheduled successfully.')
|
messages.success(request, str(total) + ' Observations were scheduled successfully.')
|
||||||
response = redirect(reverse('base:observations_list'))
|
response = redirect(reverse('base:observations_list'))
|
||||||
except (ValueError, ValidationError, ObservationOverlapError, NegativeElevationError,
|
except (ObservationOverlapError, NegativeElevationError, SinglePassError, ValidationError,
|
||||||
SinglePassError) as error:
|
ValueError) as error:
|
||||||
messages.error(request, '{0}'.format(error.message))
|
messages.error(request, str(error))
|
||||||
response = redirect(reverse('base:observation_new'))
|
response = redirect(reverse('base:observation_new'))
|
||||||
except LatestTle.DoesNotExist:
|
except LatestTle.DoesNotExist:
|
||||||
message = 'Scheduling failed: Satellite without TLE'
|
message = 'Scheduling failed: Satellite without TLE'
|
||||||
|
@ -393,7 +393,7 @@ def prediction_windows(request):
|
||||||
return JsonResponse(data, safe=False)
|
return JsonResponse(data, safe=False)
|
||||||
downlink = transmitter[0]['downlink_low']
|
downlink = transmitter[0]['downlink_low']
|
||||||
except DBConnectionError as error:
|
except DBConnectionError as error:
|
||||||
data = [{'error': error.message}]
|
data = [{'error': str(error)}]
|
||||||
return JsonResponse(data, safe=False)
|
return JsonResponse(data, safe=False)
|
||||||
|
|
||||||
# Fetch all available ground stations
|
# Fetch all available ground stations
|
||||||
|
@ -680,7 +680,7 @@ def scheduling_stations(request):
|
||||||
data = [{'error': 'You should select a valid Transmitter.'}]
|
data = [{'error': 'You should select a valid Transmitter.'}]
|
||||||
return JsonResponse(data, safe=False)
|
return JsonResponse(data, safe=False)
|
||||||
except DBConnectionError as error:
|
except DBConnectionError as error:
|
||||||
data = [{'error': error.message}]
|
data = [{'error': str(error)}]
|
||||||
return JsonResponse(data, safe=False)
|
return JsonResponse(data, safe=False)
|
||||||
|
|
||||||
stations = Station.objects.filter(status__gt=0).prefetch_related('antenna')
|
stations = Station.objects.filter(status__gt=0).prefetch_related('antenna')
|
||||||
|
@ -877,7 +877,7 @@ def satellite_view(request, norad_id):
|
||||||
try:
|
try:
|
||||||
transmitters = get_transmitters_by_norad_id(norad_id=norad_id)
|
transmitters = get_transmitters_by_norad_id(norad_id=norad_id)
|
||||||
except DBConnectionError as error:
|
except DBConnectionError as error:
|
||||||
data = [{'error': error.message}]
|
data = [{'error': str(error)}]
|
||||||
return JsonResponse(data, safe=False)
|
return JsonResponse(data, safe=False)
|
||||||
satellite_stats = satellite_stats_by_transmitter_list(transmitters)
|
satellite_stats = satellite_stats_by_transmitter_list(transmitters)
|
||||||
data = {
|
data = {
|
||||||
|
@ -911,7 +911,7 @@ def transmitters_view(request):
|
||||||
try:
|
try:
|
||||||
transmitters = get_transmitters_by_norad_id(norad_id)
|
transmitters = get_transmitters_by_norad_id(norad_id)
|
||||||
except DBConnectionError as error:
|
except DBConnectionError as error:
|
||||||
data = [{'error': error.message}]
|
data = [{'error': str(error)}]
|
||||||
return JsonResponse(data, safe=False)
|
return JsonResponse(data, safe=False)
|
||||||
|
|
||||||
transmitters = [
|
transmitters = [
|
||||||
|
|
Loading…
Reference in New Issue