gh-43702: Replace existing CTE in encode_base64() and encode_quopri()

Both encoders added a Content-Transfer-Encoding header without removing
an existing one, so re-encoding a message that already had one left two
such headers.  Delete the old header first.  encode_7or8bit() is left
alone because it does not change the payload.

Author: soreavis

Lib/email/encoders.py

@@ -30,6 +30,7 @@ def encode_base64(msg):
     orig = msg.get_payload(decode=True)
     encdata = str(_bencode(orig), 'ascii')
     msg.set_payload(encdata)
+    del msg['Content-Transfer-Encoding']
     msg['Content-Transfer-Encoding'] = 'base64'
 
 
@@ -41,6 +42,7 @@ def encode_quopri(msg):
     orig = msg.get_payload(decode=True)
     encdata = _qencode(orig)
     msg.set_payload(encdata)
+    del msg['Content-Transfer-Encoding']
     msg['Content-Transfer-Encoding'] = 'quoted-printable'
 
 

Lib/test/test_email/test_email.py

@@ -916,6 +916,20 @@ def test_default_cte(self):
         msg = MIMEText('hello \xf8 world', _charset='iso-8859-1')
         eq(msg['content-transfer-encoding'], 'quoted-printable')
 
+    def test_encode_replaces_existing_cte(self):
+        # gh-43702: re-encoding must replace the old Content-Transfer-Encoding
+        # header, not add a second one.
+        for charset, encoder, cte in (
+                ('iso-8859-1', encoders.encode_base64, 'base64'),
+                ('utf-8', encoders.encode_quopri, 'quoted-printable')):
+            with self.subTest(cte=cte):
+                msg = MIMEText('h\xe9llo', _charset=charset)
+                encoder(msg)
+                self.assertEqual(msg.get_all('content-transfer-encoding'),
+                                 [cte])
+                self.assertEqual(msg.get_payload(decode=True),
+                                 'h\xe9llo'.encode(charset))
+
     def test_encode7or8bit(self):
         # Make sure a charset whose input character set is 8bit but
         # whose output character set is 7bit gets a transfer-encoding

Misc/NEWS.d/next/Library/2026-09-26-10-43-18.gh-issue-43702.koAZST.rst

@@ -0,0 +1,4 @@
+Fix :func:`email.encoders.encode_base64` and
+:func:`email.encoders.encode_quopri` adding a second
+:mailheader:`Content-Transfer-Encoding` header when they re-encode a
+message that already has one.