issue34138: fix implementation of utf8 append and tests

gordonmessmer · gordonmessmer · commit c116b7649993 · 2023-02-13T22:14:38.000-08:00
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
@@ -994,7 +994,7 @@ def _command(self, name, *args):
                 literator = None
                 if self.utf8_enabled:
                     data = data + bytes(' UTF8 (~{%s}' % len(literal), self._encoding)
-                    literal = literal + b')'
+                    literal = literal + CRLF + b')'
                 else:
                     data = data + bytes(' {%s}' % len(literal), self._encoding)
 
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
@@ -312,6 +312,7 @@ def cmd_AUTHENTICATE(self, tag, args):
             def cmd_APPEND(self, tag, args):
                 self._send_textline('+')
                 self.server.response = yield
+                yield
                 self._send_tagged(tag, 'OK', 'okay')
         client, server = self._setup(UTF8AppendServer)
         self.assertEqual(client._encoding, 'ascii')
@@ -325,7 +326,7 @@ def cmd_APPEND(self, tag, args):
         typ, data = client.append(None, None, None, msg_string.encode('utf-8'))
         self.assertEqual(typ, 'OK')
         self.assertEqual(server.response,
-            ('UTF8 (%s)\r\n' % msg_string).encode('utf-8'))
+            ('%s' % msg_string).encode('utf-8'))
 
     def test_search_disallows_charset_in_utf8_mode(self):
         class UTF8Server(SimpleIMAPHandler):
@@ -760,6 +761,7 @@ class UTF8AppendServer(self.UTF8Server):
             def cmd_APPEND(self, tag, args):
                 self._send_textline('+')
                 self.server.response = yield
+                yield
                 self._send_tagged(tag, 'OK', 'okay')
 
         with self.reaped_pair(UTF8AppendServer) as (server, client):
@@ -777,7 +779,7 @@ def cmd_APPEND(self, tag, args):
             self.assertEqual(typ, 'OK')
             self.assertEqual(
                 server.response,
-                ('UTF8 (%s)\r\n' % msg_string).encode('utf-8')
+                ('%s' % msg_string).encode('utf-8')
             )
 
     # XXX also need a test that makes sure that the Literal and Untagged_status
