ref(py3): exceptions.message -> six.text_type (#16731)

src/sentry/api/base.py

@@ -253,7 +253,7 @@ class Endpoint(APIView):
         try:
             cursor_result = paginator.get_result(limit=per_page, cursor=input_cursor)
         except BadPaginationError as e:
-            return Response({"detail": e.message}, status=400)
+            return Response({"detail": six.text_type(e)}, status=400)
 
         # map results based on callback
         if on_results:

src/sentry/api/bases/organization.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
+import six
 from rest_framework.exceptions import PermissionDenied, ParseError
-
 from django.core.cache import cache
 
 from sentry.api.base import Endpoint
@@ -244,8 +244,8 @@ class OrganizationEndpoint(Endpoint):
         # from the request
         try:
             start, end = get_date_range_from_params(request.GET, optional=date_filter_optional)
-        except InvalidParams as exc:
-            raise OrganizationEventsError(exc.message)
+        except InvalidParams as e:
+            raise OrganizationEventsError(six.text_type(e))
 
         try:
             projects = self.get_projects(request, organization)
@@ -255,7 +255,7 @@ class OrganizationEndpoint(Endpoint):
         if not projects:
             raise NoProjects
 
-        environments = [e.name for e in self.get_environments(request, organization)]
+        environments = [env.name for env in self.get_environments(request, organization)]
         params = {"start": start, "end": end, "project_id": [p.id for p in projects]}
         if environments:
             params["environment"] = environments

src/sentry/api/bases/organization_events.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+import six
 from rest_framework.exceptions import PermissionDenied
 
 from sentry.api.bases import OrganizationEndpoint, OrganizationEventsError
@@ -15,8 +16,8 @@ class OrganizationEventsEndpointBase(OrganizationEndpoint):
         query = request.GET.get("query")
         try:
             return get_filter(query, params)
-        except InvalidSearchQuery as exc:
-            raise OrganizationEventsError(exc.message)
+        except InvalidSearchQuery as e:
+            raise OrganizationEventsError(six.text_type(e))
 
     def get_orderby(self, request):
         sort = request.GET.getlist("sort")
@@ -58,8 +59,8 @@ class OrganizationEventsEndpointBase(OrganizationEndpoint):
         query = request.GET.get("query")
         try:
             _filter = get_filter(query, params)
-        except InvalidSearchQuery as exc:
-            raise OrganizationEventsError(exc.message)
+        except InvalidSearchQuery as e:
+            raise OrganizationEventsError(six.text_type(e))
 
         snuba_args = {
             "start": _filter.start,

src/sentry/api/endpoints/accept_project_transfer.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import
 
+import six
 from django.http import Http404
 from django.utils.encoding import force_str
 from django.core.signing import BadSignature, SignatureExpired
-
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
@@ -62,8 +62,8 @@ class AcceptProjectTransferEndpoint(Endpoint):
 
         try:
             data, project = self.get_validated_data(data, request.user)
-        except InvalidPayload as exc:
-            return Response({"detail": exc.message}, status=400)
+        except InvalidPayload as e:
+            return Response({"detail": six.text_type(e)}, status=400)
 
         organizations = Organization.objects.filter(
             status=OrganizationStatus.ACTIVE,
@@ -93,8 +93,8 @@ class AcceptProjectTransferEndpoint(Endpoint):
 
         try:
             data, project = self.get_validated_data(data, request.user)
-        except InvalidPayload as exc:
-            return Response({"detail": exc.message}, status=400)
+        except InvalidPayload as e:
+            return Response({"detail": six.text_type(e)}, status=400)
 
         transaction_id = data["transaction_id"]
 

src/sentry/api/endpoints/data_export.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-
+import six
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
 from rest_framework.response import Response
@@ -51,7 +51,7 @@ class DataExportEndpoint(OrganizationEndpoint):
             )
         except ValidationError as e:
             # This will handle invalid JSON requests
-            return Response({"detail": e.message}, status=400)
+            return Response({"detail": six.text_type(e)}, status=400)
 
         compile_data.delay(data_export=data_export)
         return Response(serialize(data_export, request.user), status=201)

src/sentry/api/endpoints/group_events.py

@@ -66,8 +66,8 @@ class GroupEventsEndpoint(GroupEndpoint, EnvironmentMixin):
 
         try:
             start, end = get_date_range_from_params(request.GET, optional=True)
-        except InvalidParams as exc:
-            return Response({"detail": exc.message}, status=400)
+        except InvalidParams as e:
+            return Response({"detail": six.text_type(e)}, status=400)
 
         try:
             return self._get_events_snuba(request, group, environments, query, tags, start, end)

src/sentry/api/endpoints/group_integration_details.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
+import six
 from django.db import IntegrityError, transaction
-
 from rest_framework.response import Response
 
 from sentry import features
@@ -77,8 +77,8 @@ class GroupIntegrationDetailsEndpoint(GroupEndpoint):
                     organization_id=organization_id,
                 )
             )
-        except IntegrationError as exc:
-            return Response({"detail": exc.message}, status=400)
+        except IntegrationError as e:
+            return Response({"detail": six.text_type(e)}, status=400)
 
     # was thinking put for link an existing issue, post for create new issue?
     def put(self, request, group, integration_id):
@@ -108,8 +108,8 @@ class GroupIntegrationDetailsEndpoint(GroupEndpoint):
             data = installation.get_issue(external_issue_id, data=request.data)
         except IntegrationFormError as exc:
             return Response(exc.field_errors, status=400)
-        except IntegrationError as exc:
-            return Response({"non_field_errors": [exc.message]}, status=400)
+        except IntegrationError as e:
+            return Response({"non_field_errors": [six.text_type(e)]}, status=400)
 
         defaults = {
             "title": data.get("title"),
@@ -140,8 +140,8 @@ class GroupIntegrationDetailsEndpoint(GroupEndpoint):
             installation.after_link_issue(external_issue, data=request.data)
         except IntegrationFormError as exc:
             return Response(exc.field_errors, status=400)
-        except IntegrationError as exc:
-            return Response({"non_field_errors": [exc.message]}, status=400)
+        except IntegrationError as e:
+            return Response({"non_field_errors": [six.text_type(e)]}, status=400)
 
         try:
             with transaction.atomic():
@@ -192,8 +192,8 @@ class GroupIntegrationDetailsEndpoint(GroupEndpoint):
             data = installation.create_issue(request.data)
         except IntegrationFormError as exc:
             return Response(exc.field_errors, status=400)
-        except IntegrationError as exc:
-            return Response({"non_field_errors": [exc.message]}, status=400)
+        except IntegrationError as e:
+            return Response({"non_field_errors": [six.text_type(e)]}, status=400)
 
         external_issue_key = installation.make_external_key(data)
         external_issue, created = ExternalIssue.objects.get_or_create(

src/sentry/api/endpoints/organization_event_details.py

@@ -19,8 +19,8 @@ class OrganizationEventDetailsEndpoint(OrganizationEventsEndpointBase):
 
         try:
             params = self.get_filter_params(request, organization)
-        except OrganizationEventsError as exc:
-            return Response({"detail": exc.message}, status=400)
+        except OrganizationEventsError as e:
+            return Response({"detail": six.text_type(e)}, status=400)
         except NoProjects:
             return Response(status=404)
 

src/sentry/api/endpoints/organization_events.py

@@ -42,8 +42,8 @@ class OrganizationEventsEndpoint(OrganizationEventsEndpointBase):
         full = request.GET.get("full", False)
         try:
             snuba_args = self.get_snuba_query_args_legacy(request, organization)
-        except OrganizationEventsError as exc:
-            return Response({"detail": exc.message}, status=400)
+        except OrganizationEventsError as e:
+            return Response({"detail": six.text_type(e)}, status=400)
         except NoProjects:
             # return empty result if org doesn't have projects
             # or user doesn't have access to projects in org

src/sentry/api/endpoints/organization_events_meta.py

@@ -13,8 +13,8 @@ class OrganizationEventsMetaEndpoint(OrganizationEventsEndpointBase):
     def get(self, request, organization):
         try:
             params = self.get_filter_params(request, organization)
-        except OrganizationEventsError as exc:
-            return Response({"detail": exc.message}, status=400)
+        except OrganizationEventsError as e:
+            return Response({"detail": six.text_type(e)}, status=400)
         except NoProjects:
             return Response({"count": 0})