Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-78319: add UTF8 marker per RFC #9436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

gh-78319: add UTF8 marker per RFC #9436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82660df
issue34138: fix implementation of utf8 append
gordonmessmer Sep 20, 2018
085544f
issue34138: fix implementation of utf8 append
gordonmessmer Sep 20, 2018
463a07f
Merge branch 'main' into master
hauntsaninja Feb 9, 2023
5a92499
Add NEWS for UTF8 IMAP APPEND fix.
gordonmessmer Feb 14, 2023
81faa3c
issue34138: fix implementation of utf8 append and tests
gordonmessmer Feb 14, 2023
44b7acb
Empty commit ; re-run tests
gordonmessmer Feb 26, 2023
94c5b1d
Merge branch 'main' into master
gordonmessmer Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Lib/imaplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,6 @@ def append(self, mailbox, flags, date_time, message):
else:
date_time = None
literal = MapCRLF.sub(CRLF, message)
if self.utf8_enabled:
literal = b'UTF8 (' + literal + b')'
self.literal = literal
return self._simple_command(name, mailbox, flags, date_time)

Expand Down Expand Up @@ -994,7 +992,11 @@ def _command(self, name, *args):
literator = literal
else:
literator = None
data = data + bytes(' {%s}' % len(literal), self._encoding)
if self.utf8_enabled:
data = data + bytes(' UTF8 (~{%s}' % len(literal), self._encoding)
literal = literal + b')'
else:
data = data + bytes(' {%s}' % len(literal), self._encoding)

if __debug__:
if self.debug >= 4:
Expand Down
29 changes: 20 additions & 9 deletions Lib/test/test_imaplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ def cmd_AUTHENTICATE(self, tag, args):
self._send_tagged(tag, 'OK', 'FAKEAUTH successful')
def cmd_APPEND(self, tag, args):
self._send_textline('+')
self.server.response = yield
self.server.response = args
literal = yield
self.server.response.append(literal)
literal = yield
self.server.response.append(literal)
self._send_tagged(tag, 'OK', 'okay')
client, server = self._setup(UTF8AppendServer)
self.assertEqual(client._encoding, 'ascii')
Expand All @@ -323,10 +327,13 @@ def cmd_APPEND(self, tag, args):
self.assertEqual(code, 'OK')
self.assertEqual(client._encoding, 'utf-8')
msg_string = 'Subject: üñí©öðé'
typ, data = client.append(None, None, None, msg_string.encode('utf-8'))
typ, data = client.append(
None, None, None, (msg_string + '\n').encode('utf-8'))
self.assertEqual(typ, 'OK')
self.assertEqual(server.response,
('UTF8 (%s)\r\n' % msg_string).encode('utf-8'))
['INBOX', 'UTF8',
'(~{25}', ('%s\r\n' % msg_string).encode('utf-8'),
b')\r\n' ])

def test_search_disallows_charset_in_utf8_mode(self):
class UTF8Server(SimpleIMAPHandler):
Expand Down Expand Up @@ -760,7 +767,11 @@ def test_enable_UTF8_True_append(self):
class UTF8AppendServer(self.UTF8Server):
def cmd_APPEND(self, tag, args):
self._send_textline('+')
self.server.response = yield
self.server.response = args
literal = yield
self.server.response.append(literal)
literal = yield
self.server.response.append(literal)
self._send_tagged(tag, 'OK', 'okay')

with self.reaped_pair(UTF8AppendServer) as (server, client):
Expand All @@ -774,12 +785,12 @@ def cmd_APPEND(self, tag, args):
self.assertEqual(client._encoding, 'utf-8')
msg_string = 'Subject: üñí©öðé'
typ, data = client.append(
None, None, None, msg_string.encode('utf-8'))
None, None, None, (msg_string + '\n').encode('utf-8'))
self.assertEqual(typ, 'OK')
self.assertEqual(
server.response,
('UTF8 (%s)\r\n' % msg_string).encode('utf-8')
)
self.assertEqual(server.response,
['INBOX', 'UTF8',
'(~{25}', ('%s\r\n' % msg_string).encode('utf-8'),
b')\r\n' ])

# XXX also need a test that makes sure that the Literal and Untagged_status
# regexes uses unicode in UTF8 mode instead of the default ASCII.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-02-13-20-34-52.gh-issue-78319.V1zzed.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTF8 support for the IMAP APPEND command has been made RFC compliant.
Loading