diff options
| author | Abhilash Raj <maxking@users.noreply.github.com> | 2019-05-17 12:28:44 -0700 |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2019-05-17 15:28:44 -0400 |
| commit | feac6cd7753425fba006e97e2d9b74a0c0c75894 (patch) | |
| tree | 60e2974c9254ed17c8bc5e7bf952c1668ed36e77 /Lib/email | |
| parent | cbe72d842646ded2454784679231e3d1e6252e72 (diff) | |
| download | cpython-git-feac6cd7753425fba006e97e2d9b74a0c0c75894.tar.gz | |
bpo-33524: Fix the folding of email header when max_line_length is 0 or None (#13391)
and there are non-ascii characters in the header.
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/_header_value_parser.py | 3 | ||||
| -rw-r--r-- | Lib/email/policy.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index 60d0d32059..649f1539fa 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -68,6 +68,7 @@ XXX: provide complete list of token types. """ import re +import sys import urllib # For urllib.parse.unquote from string import hexdigits from operator import itemgetter @@ -2590,7 +2591,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 diff --git a/Lib/email/policy.py b/Lib/email/policy.py index 5131311ac5..611deb50bb 100644 --- a/Lib/email/policy.py +++ b/Lib/email/policy.py @@ -3,6 +3,7 @@ code that adds all the email6 features. """ 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 @@ -203,7 +204,7 @@ class EmailPolicy(Policy): 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 |