Skip to content

bpo-33524: Fix the behavior when max_line_length is 0 or None in email.policy #6966

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

Closed
Licht-T wants to merge 2 commits into from
Closed

bpo-33524: Fix the behavior when max_line_length is 0 or None in email.policy #6966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d5050a
BUG: Fix the behavior when max_line_length is 0 or None in email.policy
Licht-T May 18, 2018
7cdddfd
TST: Add test when max_line_length is 0 or None in email.policy
Licht-T May 18, 2018
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 changes: 2 additions & 1 deletion Lib/email/_header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"""

import re
import sys
import urllib # For urllib.parse.unquote
from string import hexdigits
from collections import OrderedDict
Expand Down Expand Up @@ -2591,7 +2592,7 @@ def _refold_parse_tree(parse_tree, *, policy):

"""
# max_line_length 0/None means no limit, ie: infinitely long.
maxlen = policy.max_line_length or float("+inf")
maxlen = policy.max_line_length or sys.maxsize
encoding = 'utf-8' if policy.utf8 else 'us-ascii'
lines = ['']
last_ew = None
Expand Down
3 changes: 2 additions & 1 deletion Lib/email/policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""

import re
import sys
from email._policybase import Policy, Compat32, compat32, _extend_docstrings
from email.utils import _has_surrogates
from email.headerregistry import HeaderRegistry as HeaderRegistry
Expand Down Expand Up @@ -203,7 +204,7 @@ def fold_binary(self, name, value):
def _fold(self, name, value, refold_binary=False):
if hasattr(value, 'name'):
return value.fold(policy=self)
maxlen = self.max_line_length if self.max_line_length else float('inf')
maxlen = self.max_line_length if self.max_line_length else sys.maxsize
lines = value.splitlines()
refold = (self.refold_source == 'all' or
self.refold_source == 'long' and
Expand Down
13 changes: 13 additions & 0 deletions Lib/test/test_email/test_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import io
import sys
import types
import textwrap
import unittest
Expand Down Expand Up @@ -134,6 +135,18 @@ def test_policy_addition(self):
for attr, value in expected.items():
self.assertEqual(getattr(added, attr), value)

def test_fold_zero_max_line_length(self):
expected = 'Subject: =?utf-8?q?=C3=A1?=\n'

msg = email.message.EmailMessage()
msg['Subject'] = 'á'

p1 = email.policy.default.clone(max_line_length=0)
p2 = email.policy.default.clone(max_line_length=None)

self.assertEqual(p1.fold('Subject', msg['Subject']), expected)
self.assertEqual(p2.fold('Subject', msg['Subject']), expected)

def test_register_defect(self):
class Dummy:
def __init__(self):
Expand Down