ref(py3): Fix byte usage in twilio plugin (#21082)

src/sentry_plugins/twilio/client.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 
+from base64 import b64encode
+from django.utils.encoding import force_bytes
+
 from sentry_plugins.client import ApiClient
 
 
@@ -16,7 +19,7 @@ class TwilioApiClient(ApiClient):
         super(TwilioApiClient, self).__init__()
 
     def basic_auth(self, user, password):
-        return "Basic " + (user + ":" + password).encode("base64").replace("\n", "")
+        return b"Basic " + b64encode(force_bytes(user + ":" + password))
 
     def request(self, data):
         endpoint = self.twilio_messages_endpoint.format(self.account_sid)

src/sentry_plugins/twilio/plugin.py

@@ -163,7 +163,7 @@ class TwilioPlugin(CorePluginMixin, NotificationPlugin):
             return
         project = group.project
 
-        body = "Sentry [{0}] {1}: {2}".format(
+        body = b"Sentry [%s] %s: %s" % (
             project.name.encode("utf-8"),
             event.group.get_level_display().upper().encode("utf-8"),
             event.title.encode("utf-8").splitlines()[0],