From 1719473d7099efab6f68ddf724d674f78420760d Mon Sep 17 00:00:00 2001
From: "Fabian P. Schmidt" <kerel@mailbox.org>
Date: Mon, 30 Dec 2019 22:42:29 +0100
Subject: [PATCH] Use str(error) instead of error.message (W1645)

Fixes exception-message-attribute (W1645) pylint error.

Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>
---
 .pylintrc             |  1 -
 network/api/views.py  | 17 +++--------------
 network/base/views.py | 14 +++++++-------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index f1a3a6e..a215d75 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -14,4 +14,3 @@ disable=
     W0703, # broad-except
 # py3k transition issues:
     W1633, # round-builtin
-    W1645, # exception-message-attribute
diff --git a/network/api/views.py b/network/api/views.py
index 8cd5949..b6535ab 100644
--- a/network/api/views.py
+++ b/network/api/views.py
@@ -44,24 +44,13 @@ class ObservationView(  # pylint: disable=R0901
             else:
                 data = serializer.errors
                 response = Response(data, status=status.HTTP_400_BAD_REQUEST)
-        except ValueError as error:
-            data = error.message
-            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 (NegativeElevationError, SinglePassError, ValidationError, ValueError) as error:
+            response = Response(str(error), status=status.HTTP_400_BAD_REQUEST)
         except LatestTle.DoesNotExist:
             data = 'Scheduling failed: Satellite without TLE'
             response = Response(data, status=status.HTTP_501_NOT_IMPLEMENTED)
         except ObservationOverlapError as error:
-            data = error.message
-            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)
+            response = Response(str(error), status=status.HTTP_409_CONFLICT)
         return response
 
     def update(self, request, *args, **kwargs):
diff --git a/network/base/views.py b/network/base/views.py
index 2d6a016..ad62b24 100644
--- a/network/base/views.py
+++ b/network/base/views.py
@@ -287,9 +287,9 @@ def observation_new_post(request):
         else:
             messages.success(request, str(total) + ' Observations were scheduled successfully.')
             response = redirect(reverse('base:observations_list'))
-    except (ValueError, ValidationError, ObservationOverlapError, NegativeElevationError,
-            SinglePassError) as error:
-        messages.error(request, '{0}'.format(error.message))
+    except (ObservationOverlapError, NegativeElevationError, SinglePassError, ValidationError,
+            ValueError) as error:
+        messages.error(request, str(error))
         response = redirect(reverse('base:observation_new'))
     except LatestTle.DoesNotExist:
         message = 'Scheduling failed: Satellite without TLE'
@@ -393,7 +393,7 @@ def prediction_windows(request):
             return JsonResponse(data, safe=False)
         downlink = transmitter[0]['downlink_low']
     except DBConnectionError as error:
-        data = [{'error': error.message}]
+        data = [{'error': str(error)}]
         return JsonResponse(data, safe=False)
 
     # Fetch all available ground stations
@@ -680,7 +680,7 @@ def scheduling_stations(request):
             data = [{'error': 'You should select a valid Transmitter.'}]
             return JsonResponse(data, safe=False)
     except DBConnectionError as error:
-        data = [{'error': error.message}]
+        data = [{'error': str(error)}]
         return JsonResponse(data, safe=False)
 
     stations = Station.objects.filter(status__gt=0).prefetch_related('antenna')
@@ -877,7 +877,7 @@ def satellite_view(request, norad_id):
     try:
         transmitters = get_transmitters_by_norad_id(norad_id=norad_id)
     except DBConnectionError as error:
-        data = [{'error': error.message}]
+        data = [{'error': str(error)}]
         return JsonResponse(data, safe=False)
     satellite_stats = satellite_stats_by_transmitter_list(transmitters)
     data = {
@@ -911,7 +911,7 @@ def transmitters_view(request):
     try:
         transmitters = get_transmitters_by_norad_id(norad_id)
     except DBConnectionError as error:
-        data = [{'error': error.message}]
+        data = [{'error': str(error)}]
         return JsonResponse(data, safe=False)
 
     transmitters = [