From 0e07b960cbcd764bb8a402ef495dd4b25b518606 Mon Sep 17 00:00:00 2001
From: Jack Pendley <jpendley@umich.edu>
Date: Mon, 12 Dec 2022 15:28:59 -0500
Subject: [PATCH 1/3] Removed def _handle_multipart_signed from generator.py
 file to solve issue #99533 where EmailMessage behaves differently when being
 set to multipart/signed mimetype

---
 Lib/email/generator.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 885e6ba98540a7..f956a9e2baf026 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -313,17 +313,6 @@ def _handle_multipart(self, msg):
                 epilogue = msg.epilogue
             self._write_lines(epilogue)
 
-    def _handle_multipart_signed(self, msg):
-        # The contents of signed parts has to stay unmodified in order to keep
-        # the signature intact per RFC1847 2.1, so we disable header wrapping.
-        # RDM: This isn't enough to completely preserve the part, but it helps.
-        p = self.policy
-        self.policy = p.clone(max_line_length=0)
-        try:
-            self._handle_multipart(msg)
-        finally:
-            self.policy = p
-
     def _handle_message_delivery_status(self, msg):
         # We can't just write the headers directly to self's file object
         # because this will leave an extra newline between the last header

From 64582670702e9db41ceae114e2cc0a429768ab3d Mon Sep 17 00:00:00 2001
From: Jack Pendley <jpendley@umich.edu>
Date: Mon, 12 Dec 2022 17:43:10 -0500
Subject: [PATCH 2/3] Added unit test to test_email.py to ensure removing def
 _handle_multipart_signed would resolve issue #99533

---
 Lib/test/test_email/test_email.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 44b405740c4403..b0c4df450e985f 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -5564,6 +5564,13 @@ def test_long_headers_flatten(self):
         result = fp.getvalue()
         self._signed_parts_eq(original, result)
 
+    def test_multipart_signed(self):
+        inner = Message()
+        outer = Message()
+        outer.set_type("multipart/signed")
+        outer.attach(inner)
+        self.assertTrue(inner.as_string() in outer.as_string())
+
 class TestHeaderRegistry(TestEmailBase):
     # See issue gh-93010.
     def test_HeaderRegistry(self):

From 77af2cbdc9a6e6ffd5d8383d0697a192b16cd3ee Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 00:31:02 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../next/Build/2022-12-13-00-31-01.gh-issue-99533.cEDd71.rst    | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Build/2022-12-13-00-31-01.gh-issue-99533.cEDd71.rst

diff --git a/Misc/NEWS.d/next/Build/2022-12-13-00-31-01.gh-issue-99533.cEDd71.rst b/Misc/NEWS.d/next/Build/2022-12-13-00-31-01.gh-issue-99533.cEDd71.rst
new file mode 100644
index 00000000000000..964ab01a85ffa5
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-12-13-00-31-01.gh-issue-99533.cEDd71.rst
@@ -0,0 +1,2 @@
+Fix issue where email.generator.Generator ignores policy when using multipart/signed due to old functions in generator.py
+:func:`_handle_multipart_signed`. Patch by Jack Pendley.