Keep angle brackets on SendGrid smtp-id

SendGrid seems to consistently use <angle brackets>
on Message-ID and smtp-id.

Author: medmunds

anymail/backends/sendgrid.py

@@ -1,5 +1,3 @@
-from email.utils import unquote
-
 from django.core.mail import make_msgid
 from requests.structures import CaseInsensitiveDict
 
@@ -115,8 +113,7 @@ def ensure_message_id(self):
         # Workaround for missing message ID (smtp-id) in SendGrid engagement events
         # (click and open tracking): because unique_args get merged into the raw event
         # record, we can supply the 'smtp-id' field for any events missing it.
-        # Must use the unquoted (no <angle brackets>) version to match other SendGrid APIs.
-        self.smtpapi.setdefault('unique_args', {})['smtp-id'] = unquote(self.message_id)
+        self.smtpapi.setdefault('unique_args', {})['smtp-id'] = self.message_id
 
     def make_message_id(self):
         """Returns a Message-ID that could be used for this payload

tests/test_sendgrid_backend.py

@@ -64,9 +64,9 @@ def test_send_mail(self):
         # make sure backend assigned a Message-ID for event tracking
         email_headers = json.loads(data['headers'])
         self.assertRegex(email_headers['Message-ID'], r'\<.+@sender\.example\.com\>')  # id uses from_email's domain
-        # make sure we added the unquoted Message-ID to unique_args for event notification
+        # make sure we added the Message-ID to unique_args for event notification
         smtpapi = self.get_smtpapi()
-        self.assertEqual(email_headers['Message-ID'], '<{}>'.format(smtpapi['unique_args']['smtp-id']))
+        self.assertEqual(email_headers['Message-ID'], smtpapi['unique_args']['smtp-id'])
 
     @override_settings(ANYMAIL={'SENDGRID_USERNAME': 'sg_username', 'SENDGRID_PASSWORD': 'sg_password'})
     def test_user_pass_auth(self):
@@ -110,7 +110,7 @@ def test_email_message(self):
             cc=['[email protected]', 'Also CC <[email protected]>'],
             headers={'Reply-To': '[email protected]',
                      'X-MyHeader': 'my value',
-                     'Message-ID': '[email protected]'})  # should override backend msgid
+                     'Message-ID': '<[email protected]>'})  # should override backend msgid
         email.send()
         data = self.get_api_call_data()
         self.assertEqual(data['subject'], "Subject")
@@ -123,13 +123,13 @@ def test_email_message(self):
         self.assertEqual(data['cc'], ['[email protected]', '[email protected]'])
         self.assertEqual(data['ccname'], [' ', 'Also CC'])
         self.assertJSONEqual(data['headers'], {
-            'Message-ID': '[email protected]',
+            'Message-ID': '<[email protected]>',
             'Reply-To': '[email protected]',
             'X-MyHeader': 'my value',
         })
         # make sure custom Message-ID also added to unique_args
         self.assertJSONEqual(data['x-smtpapi'], {
-            'unique_args': {'smtp-id': '[email protected]'}
+            'unique_args': {'smtp-id': '<[email protected]>'}
         })
 
     def test_html_message(self):