spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

Merge branch 'pr/fix_W1645' into 'master' 

Use str(error) instead of error.message (W1645)

See merge request librespacefoundation/satnogs/satnogs-network!851
merge-requests/851/merge
Fabian P. Schmidt 2020-01-04 14:07:47 +00:00
parent 6ed02d4dd9 11df29ba1d
commit 2a04b54c6c
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pylintrc
View File

@ -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

17
network/api/views.py
View File

@ -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):

21
network/base/views.py
View File

@ -264,9 +264,9 @@ def observation_new_post(request):
errors_list = [error for error in formset.errors if error] errors_list = [error for error in formset.errors if error]
if errors_list: if errors_list:
for field in errors_list[0]: for field in errors_list[0]:
messages.error(request, '{0}'.format(errors_list[0][field][0])) messages.error(request, str(errors_list[0][field][0]))
else: else:
messages.error(request, '{0}'.format(formset.non_form_errors()[0])) messages.error(request, str(formset.non_form_errors()[0]))
return redirect(reverse('base:observation_new')) return redirect(reverse('base:observation_new'))
new_observations = create_new_observations(formset, request.user) new_observations = create_new_observations(formset, request.user)
@ -287,13 +287,12 @@ 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' messages.error(request, 'Scheduling failed: Satellite without TLE')
messages.error(request, '{0}'.format(message))
response = redirect(reverse('base:observation_new')) response = redirect(reverse('base:observation_new'))
return response return response
@ -393,7 +392,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 +679,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 +876,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 +910,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 = [