Skip to content

[3.14] gh-49680: Test imaplib.IMAP4.append line-ending normalization (GH-152877) #152878

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

Merged
serhiy-storchaka merged 1 commit into from
Jul 2, 2026
Merged

[3.14] gh-49680: Test imaplib.IMAP4.append line-ending normalization (GH-152877) #152878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[3.15] gh-49680: Test imaplib.IMAP4.append line-ending normalization (G… 
…H-152877)

gh-49680: Test imaplib.IMAP4.append line-ending normalization

(cherry picked from commit ddb6539)
(cherry picked from commit 6759fd8)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Co-authored-by: harjoth <harjoth.khara@gmail.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
  • Loading branch information
@serhiy-storchaka @harjothkhara
@claude @miss-islington
3 people authored and miss-islington committed Jul 2, 2026
commit 74a33e6f0a9f8528ec27e0ece1c176158f3e4fc3
34 changes: 28 additions & 6 deletions Lib/test/test_imaplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import calendar
import threading
import re
import select
import socket

from test.support import verbose, run_with_tz, run_with_locale, cpython_only
Expand Down Expand Up @@ -90,6 +91,18 @@ class Handler(SimpleIMAPHandler):
return Handler


def _read_literal(handler, marker):
# Read one literal, a raw octet sequence, by its count from the marker
# ('{N}', or '(~{N}' in UTF8 mode).
size = int(re.search(r'\{(\d+)\}', marker).group(1))
# The client must wait for the continuation, so nothing should be readable.
if select.select([handler.connection], [], [], 0)[0]:
raise AssertionError('client sent the literal before the '
'continuation request')
handler._send_textline('+')
return handler.rfile.read(size)


class TestImaplib(unittest.TestCase):

def test_Internaldate2tuple(self):
Expand Down Expand Up @@ -475,10 +488,8 @@ def cmd_AUTHENTICATE(self, tag, args):
self.server.response = yield
self._send_tagged(tag, 'OK', 'FAKEAUTH successful')
def cmd_APPEND(self, tag, args):
self._send_textline('+')
self.server.response = args
literal = yield
self.server.response.append(literal)
self.server.response.append(_read_literal(self, args[-1]))
literal = yield
self.server.response.append(literal)
self._send_tagged(tag, 'OK', 'okay')
Expand Down Expand Up @@ -743,6 +754,19 @@ def test_login(self):
self.assertEqual(data[0], b'LOGIN completed')
self.assertEqual(client.state, 'AUTH')

def test_append_line_endings(self):
# append() normalizes bare CR and LF in the message to CRLF.
class AppendHandler(SimpleIMAPHandler):
def cmd_APPEND(self, tag, args):
self.server.response = _read_literal(self, args[-1])
yield # read the trailer line
self._send_tagged(tag, 'OK', 'APPEND completed')
client, server = self._setup(AppendHandler)
client.login('user', 'pass')
message = b'a\rb\nc\r\nd'
client.append('INBOX', None, None, message)
self.assertEqual(server.response, b'a\r\nb\r\nc\r\nd')

def test_login_capabilities(self):
# A server may advertise new capabilities after login (as an
# untagged CAPABILITY response); imaplib must refresh its cached
Expand Down Expand Up @@ -1651,10 +1675,8 @@ def test_enable_UTF8_True_append(self):

class UTF8AppendServer(self.UTF8Server):
def cmd_APPEND(self, tag, args):
self._send_textline('+')
self.server.response = args
literal = yield
self.server.response.append(literal)
self.server.response.append(_read_literal(self, args[-1]))
literal = yield
self.server.response.append(literal)
self._send_tagged(tag, 'OK', 'okay')
Expand Down
Loading